summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-11 15:04:25 -0500
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-30 13:14:50 -0500
commitd9b67e1e499b056a83d2db6046d74652cf836998 (patch)
tree2bbb9634836f32fa76bdc1db8a7b9d0b5658dbba /fs/nfs/nfs4proc.c
parentad05cc0f04341216923895c05e2c364ef34f1bb4 (diff)
NFS: Fix inconsistent indentation in nfs4proc.c
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ae03f976fbd3..328eda9e6db1 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2209,15 +2209,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
2209 data->is_recover = 1; 2209 data->is_recover = 1;
2210 } 2210 }
2211 task = rpc_run_task(&task_setup_data); 2211 task = rpc_run_task(&task_setup_data);
2212 if (IS_ERR(task)) 2212 if (IS_ERR(task))
2213 return PTR_ERR(task); 2213 return PTR_ERR(task);
2214 status = nfs4_wait_for_completion_rpc_task(task); 2214 status = nfs4_wait_for_completion_rpc_task(task);
2215 if (status != 0) { 2215 if (status != 0) {
2216 data->cancelled = 1; 2216 data->cancelled = 1;
2217 smp_wmb(); 2217 smp_wmb();
2218 } else 2218 } else
2219 status = data->rpc_status; 2219 status = data->rpc_status;
2220 rpc_put_task(task); 2220 rpc_put_task(task);
2221 2221
2222 return status; 2222 return status;
2223} 2223}
@@ -2226,7 +2226,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
2226{ 2226{
2227 struct inode *dir = d_inode(data->dir); 2227 struct inode *dir = d_inode(data->dir);
2228 struct nfs_openres *o_res = &data->o_res; 2228 struct nfs_openres *o_res = &data->o_res;
2229 int status; 2229 int status;
2230 2230
2231 status = nfs4_run_open_task(data, 1); 2231 status = nfs4_run_open_task(data, 1);
2232 if (status != 0 || !data->rpc_done) 2232 if (status != 0 || !data->rpc_done)
@@ -2860,12 +2860,12 @@ static int _nfs4_do_setattr(struct inode *inode,
2860 struct nfs_open_context *ctx) 2860 struct nfs_open_context *ctx)
2861{ 2861{
2862 struct nfs_server *server = NFS_SERVER(inode); 2862 struct nfs_server *server = NFS_SERVER(inode);
2863 struct rpc_message msg = { 2863 struct rpc_message msg = {
2864 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], 2864 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
2865 .rpc_argp = arg, 2865 .rpc_argp = arg,
2866 .rpc_resp = res, 2866 .rpc_resp = res,
2867 .rpc_cred = cred, 2867 .rpc_cred = cred,
2868 }; 2868 };
2869 struct rpc_cred *delegation_cred = NULL; 2869 struct rpc_cred *delegation_cred = NULL;
2870 unsigned long timestamp = jiffies; 2870 unsigned long timestamp = jiffies;
2871 fmode_t fmode; 2871 fmode_t fmode;
@@ -2913,18 +2913,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
2913{ 2913{
2914 struct nfs_server *server = NFS_SERVER(inode); 2914 struct nfs_server *server = NFS_SERVER(inode);
2915 struct nfs4_state *state = ctx ? ctx->state : NULL; 2915 struct nfs4_state *state = ctx ? ctx->state : NULL;
2916 struct nfs_setattrargs arg = { 2916 struct nfs_setattrargs arg = {
2917 .fh = NFS_FH(inode), 2917 .fh = NFS_FH(inode),
2918 .iap = sattr, 2918 .iap = sattr,
2919 .server = server, 2919 .server = server,
2920 .bitmask = server->attr_bitmask, 2920 .bitmask = server->attr_bitmask,
2921 .label = ilabel, 2921 .label = ilabel,
2922 }; 2922 };
2923 struct nfs_setattrres res = { 2923 struct nfs_setattrres res = {
2924 .fattr = fattr, 2924 .fattr = fattr,
2925 .label = olabel, 2925 .label = olabel,
2926 .server = server, 2926 .server = server,
2927 }; 2927 };
2928 struct nfs4_exception exception = { 2928 struct nfs4_exception exception = {
2929 .state = state, 2929 .state = state,
2930 .inode = inode, 2930 .inode = inode,
@@ -3038,7 +3038,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
3038 } 3038 }
3039 } 3039 }
3040 3040
3041 /* hmm. we are done with the inode, and in the process of freeing 3041 /* hmm. we are done with the inode, and in the process of freeing
3042 * the state_owner. we keep this around to process errors 3042 * the state_owner. we keep this around to process errors
3043 */ 3043 */
3044 switch (task->tk_status) { 3044 switch (task->tk_status) {
@@ -4895,8 +4895,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
4895 if (newpage == NULL) 4895 if (newpage == NULL)
4896 goto unwind; 4896 goto unwind;
4897 memcpy(page_address(newpage), buf, len); 4897 memcpy(page_address(newpage), buf, len);
4898 buf += len; 4898 buf += len;
4899 buflen -= len; 4899 buflen -= len;
4900 *pages++ = newpage; 4900 *pages++ = newpage;
4901 rc++; 4901 rc++;
4902 } while (buflen != 0); 4902 } while (buflen != 0);
@@ -5219,8 +5219,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
5219 struct nfs_server *server = NFS_SERVER(inode); 5219 struct nfs_server *server = NFS_SERVER(inode);
5220 const u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL }; 5220 const u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };
5221 struct nfs_setattrargs arg = { 5221 struct nfs_setattrargs arg = {
5222 .fh = NFS_FH(inode), 5222 .fh = NFS_FH(inode),
5223 .iap = &sattr, 5223 .iap = &sattr,
5224 .server = server, 5224 .server = server,
5225 .bitmask = bitmask, 5225 .bitmask = bitmask,
5226 .label = ilabel, 5226 .label = ilabel,
@@ -5231,9 +5231,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
5231 .server = server, 5231 .server = server,
5232 }; 5232 };
5233 struct rpc_message msg = { 5233 struct rpc_message msg = {
5234 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], 5234 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
5235 .rpc_argp = &arg, 5235 .rpc_argp = &arg,
5236 .rpc_resp = &res, 5236 .rpc_resp = &res,
5237 }; 5237 };
5238 int status; 5238 int status;
5239 5239
@@ -5779,8 +5779,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
5779 }; 5779 };
5780 struct rpc_message msg = { 5780 struct rpc_message msg = {
5781 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LOCKT], 5781 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LOCKT],
5782 .rpc_argp = &arg, 5782 .rpc_argp = &arg,
5783 .rpc_resp = &res, 5783 .rpc_resp = &res,
5784 .rpc_cred = state->owner->so_cred, 5784 .rpc_cred = state->owner->so_cred,
5785 }; 5785 };
5786 struct nfs4_lock_state *lsp; 5786 struct nfs4_lock_state *lsp;