Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d9b67e1e
Commit
d9b67e1e
authored
Jan 11, 2017
by
Anna Schumaker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFS: Fix inconsistent indentation in nfs4proc.c
Signed-off-by:
Anna Schumaker
<
Anna.Schumaker@Netapp.com
>
parent
ad05cc0f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
28 deletions
+28
-28
fs/nfs/nfs4proc.c
fs/nfs/nfs4proc.c
+28
-28
No files found.
fs/nfs/nfs4proc.c
View file @
d9b67e1e
...
@@ -2209,15 +2209,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
...
@@ -2209,15 +2209,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
data
->
is_recover
=
1
;
data
->
is_recover
=
1
;
}
}
task
=
rpc_run_task
(
&
task_setup_data
);
task
=
rpc_run_task
(
&
task_setup_data
);
if
(
IS_ERR
(
task
))
if
(
IS_ERR
(
task
))
return
PTR_ERR
(
task
);
return
PTR_ERR
(
task
);
status
=
nfs4_wait_for_completion_rpc_task
(
task
);
status
=
nfs4_wait_for_completion_rpc_task
(
task
);
if
(
status
!=
0
)
{
if
(
status
!=
0
)
{
data
->
cancelled
=
1
;
data
->
cancelled
=
1
;
smp_wmb
();
smp_wmb
();
}
else
}
else
status
=
data
->
rpc_status
;
status
=
data
->
rpc_status
;
rpc_put_task
(
task
);
rpc_put_task
(
task
);
return
status
;
return
status
;
}
}
...
@@ -2226,7 +2226,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
...
@@ -2226,7 +2226,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
{
{
struct
inode
*
dir
=
d_inode
(
data
->
dir
);
struct
inode
*
dir
=
d_inode
(
data
->
dir
);
struct
nfs_openres
*
o_res
=
&
data
->
o_res
;
struct
nfs_openres
*
o_res
=
&
data
->
o_res
;
int
status
;
int
status
;
status
=
nfs4_run_open_task
(
data
,
1
);
status
=
nfs4_run_open_task
(
data
,
1
);
if
(
status
!=
0
||
!
data
->
rpc_done
)
if
(
status
!=
0
||
!
data
->
rpc_done
)
...
@@ -2860,12 +2860,12 @@ static int _nfs4_do_setattr(struct inode *inode,
...
@@ -2860,12 +2860,12 @@ static int _nfs4_do_setattr(struct inode *inode,
struct
nfs_open_context
*
ctx
)
struct
nfs_open_context
*
ctx
)
{
{
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
rpc_message
msg
=
{
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_argp
=
arg
,
.
rpc_argp
=
arg
,
.
rpc_resp
=
res
,
.
rpc_resp
=
res
,
.
rpc_cred
=
cred
,
.
rpc_cred
=
cred
,
};
};
struct
rpc_cred
*
delegation_cred
=
NULL
;
struct
rpc_cred
*
delegation_cred
=
NULL
;
unsigned
long
timestamp
=
jiffies
;
unsigned
long
timestamp
=
jiffies
;
fmode_t
fmode
;
fmode_t
fmode
;
...
@@ -2913,18 +2913,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
...
@@ -2913,18 +2913,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
{
{
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs4_state
*
state
=
ctx
?
ctx
->
state
:
NULL
;
struct
nfs4_state
*
state
=
ctx
?
ctx
->
state
:
NULL
;
struct
nfs_setattrargs
arg
=
{
struct
nfs_setattrargs
arg
=
{
.
fh
=
NFS_FH
(
inode
),
.
fh
=
NFS_FH
(
inode
),
.
iap
=
sattr
,
.
iap
=
sattr
,
.
server
=
server
,
.
server
=
server
,
.
bitmask
=
server
->
attr_bitmask
,
.
bitmask
=
server
->
attr_bitmask
,
.
label
=
ilabel
,
.
label
=
ilabel
,
};
};
struct
nfs_setattrres
res
=
{
struct
nfs_setattrres
res
=
{
.
fattr
=
fattr
,
.
fattr
=
fattr
,
.
label
=
olabel
,
.
label
=
olabel
,
.
server
=
server
,
.
server
=
server
,
};
};
struct
nfs4_exception
exception
=
{
struct
nfs4_exception
exception
=
{
.
state
=
state
,
.
state
=
state
,
.
inode
=
inode
,
.
inode
=
inode
,
...
@@ -3038,7 +3038,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
...
@@ -3038,7 +3038,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
}
}
}
}
/* hmm. we are done with the inode, and in the process of freeing
/* hmm. we are done with the inode, and in the process of freeing
* the state_owner. we keep this around to process errors
* the state_owner. we keep this around to process errors
*/
*/
switch
(
task
->
tk_status
)
{
switch
(
task
->
tk_status
)
{
...
@@ -4895,8 +4895,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
...
@@ -4895,8 +4895,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
if
(
newpage
==
NULL
)
if
(
newpage
==
NULL
)
goto
unwind
;
goto
unwind
;
memcpy
(
page_address
(
newpage
),
buf
,
len
);
memcpy
(
page_address
(
newpage
),
buf
,
len
);
buf
+=
len
;
buf
+=
len
;
buflen
-=
len
;
buflen
-=
len
;
*
pages
++
=
newpage
;
*
pages
++
=
newpage
;
rc
++
;
rc
++
;
}
while
(
buflen
!=
0
);
}
while
(
buflen
!=
0
);
...
@@ -5219,8 +5219,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
...
@@ -5219,8 +5219,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
struct
nfs_server
*
server
=
NFS_SERVER
(
inode
);
const
u32
bitmask
[
3
]
=
{
0
,
0
,
FATTR4_WORD2_SECURITY_LABEL
};
const
u32
bitmask
[
3
]
=
{
0
,
0
,
FATTR4_WORD2_SECURITY_LABEL
};
struct
nfs_setattrargs
arg
=
{
struct
nfs_setattrargs
arg
=
{
.
fh
=
NFS_FH
(
inode
),
.
fh
=
NFS_FH
(
inode
),
.
iap
=
&
sattr
,
.
iap
=
&
sattr
,
.
server
=
server
,
.
server
=
server
,
.
bitmask
=
bitmask
,
.
bitmask
=
bitmask
,
.
label
=
ilabel
,
.
label
=
ilabel
,
...
@@ -5231,9 +5231,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
...
@@ -5231,9 +5231,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
.
server
=
server
,
.
server
=
server
,
};
};
struct
rpc_message
msg
=
{
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_SETATTR
],
.
rpc_argp
=
&
arg
,
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
.
rpc_resp
=
&
res
,
};
};
int
status
;
int
status
;
...
@@ -5779,8 +5779,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
...
@@ -5779,8 +5779,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
};
};
struct
rpc_message
msg
=
{
struct
rpc_message
msg
=
{
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_LOCKT
],
.
rpc_proc
=
&
nfs4_procedures
[
NFSPROC4_CLNT_LOCKT
],
.
rpc_argp
=
&
arg
,
.
rpc_argp
=
&
arg
,
.
rpc_resp
=
&
res
,
.
rpc_resp
=
&
res
,
.
rpc_cred
=
state
->
owner
->
so_cred
,
.
rpc_cred
=
state
->
owner
->
so_cred
,
};
};
struct
nfs4_lock_state
*
lsp
;
struct
nfs4_lock_state
*
lsp
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment