]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
NFS: Fix inconsistent indentation in nfs4proc.c
authorAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 11 Jan 2017 20:04:25 +0000 (15:04 -0500)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Mon, 30 Jan 2017 18:14:50 +0000 (13:14 -0500)
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4proc.c

index ae03f976fbd3320dee1e8bed91afa096439ececf..328eda9e6db1a291f3f4f3ab9b2e5ed726bc8d9c 100644 (file)
@@ -2209,15 +2209,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
                data->is_recover = 1;
        }
        task = rpc_run_task(&task_setup_data);
-        if (IS_ERR(task))
-                return PTR_ERR(task);
-        status = nfs4_wait_for_completion_rpc_task(task);
-        if (status != 0) {
-                data->cancelled = 1;
-                smp_wmb();
-        } else
-                status = data->rpc_status;
-        rpc_put_task(task);
+       if (IS_ERR(task))
+               return PTR_ERR(task);
+       status = nfs4_wait_for_completion_rpc_task(task);
+       if (status != 0) {
+               data->cancelled = 1;
+               smp_wmb();
+       } else
+               status = data->rpc_status;
+       rpc_put_task(task);
 
        return status;
 }
@@ -2226,7 +2226,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
 {
        struct inode *dir = d_inode(data->dir);
        struct nfs_openres *o_res = &data->o_res;
-        int status;
+       int status;
 
        status = nfs4_run_open_task(data, 1);
        if (status != 0 || !data->rpc_done)
@@ -2860,12 +2860,12 @@ static int _nfs4_do_setattr(struct inode *inode,
                            struct nfs_open_context *ctx)
 {
        struct nfs_server *server = NFS_SERVER(inode);
-        struct rpc_message msg = {
+       struct rpc_message msg = {
                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
                .rpc_argp       = arg,
                .rpc_resp       = res,
                .rpc_cred       = cred,
-        };
+       };
        struct rpc_cred *delegation_cred = NULL;
        unsigned long timestamp = jiffies;
        fmode_t fmode;
@@ -2913,18 +2913,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
 {
        struct nfs_server *server = NFS_SERVER(inode);
        struct nfs4_state *state = ctx ? ctx->state : NULL;
-        struct nfs_setattrargs  arg = {
-                .fh             = NFS_FH(inode),
-                .iap            = sattr,
+       struct nfs_setattrargs  arg = {
+               .fh             = NFS_FH(inode),
+               .iap            = sattr,
                .server         = server,
                .bitmask = server->attr_bitmask,
                .label          = ilabel,
-        };
-        struct nfs_setattrres  res = {
+       };
+       struct nfs_setattrres  res = {
                .fattr          = fattr,
                .label          = olabel,
                .server         = server,
-        };
+       };
        struct nfs4_exception exception = {
                .state = state,
                .inode = inode,
@@ -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
         */
        switch (task->tk_status) {
@@ -4895,8 +4895,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
                if (newpage == NULL)
                        goto unwind;
                memcpy(page_address(newpage), buf, len);
-                buf += len;
-                buflen -= len;
+               buf += len;
+               buflen -= len;
                *pages++ = newpage;
                rc++;
        } while (buflen != 0);
@@ -5219,8 +5219,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
        struct nfs_server *server = NFS_SERVER(inode);
        const u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };
        struct nfs_setattrargs arg = {
-               .fh             = NFS_FH(inode),
-               .iap            = &sattr,
+               .fh             = NFS_FH(inode),
+               .iap            = &sattr,
                .server         = server,
                .bitmask        = bitmask,
                .label          = ilabel,
@@ -5231,9 +5231,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
                .server         = server,
        };
        struct rpc_message msg = {
-               .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
+               .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
+               .rpc_argp       = &arg,
+               .rpc_resp       = &res,
        };
        int status;
 
@@ -5779,8 +5779,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
        };
        struct rpc_message msg = {
                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_LOCKT],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
+               .rpc_argp       = &arg,
+               .rpc_resp       = &res,
                .rpc_cred       = state->owner->so_cred,
        };
        struct nfs4_lock_state *lsp;