NFS: Move call to nfs4_state_protect() to nfs4_commit_setup()

Rather than doing this in the generic NFS client code.  Let's put this
with the other v4 stuff so it's all in one place.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 3ffaff4715925d174e71c0fe42a45e7ee796ee0c..6ed6a4195906cf496242346b0d04b24af1af9465 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -845,7 +845,8 @@ static int nfs3_commit_done(struct rpc_task *task, struct nfs_commit_data *data)
        return 0;
 }
 
-static void nfs3_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg)
+static void nfs3_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg,
+                                  struct rpc_clnt **clnt)
 {
        msg->rpc_proc = &nfs3_procedures[NFS3PROC_COMMIT];
 }

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 09be575e9194b2f7e7670deae4fe3e7953e98831..50a067018a60d0da5c5301c53df56a15839083ed 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5028,7 +5028,8 @@ static int nfs4_commit_done(struct rpc_task *task, struct nfs_commit_data *data)
        return data->commit_done_cb(task, data);
 }
 
-static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg)
+static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg,
+                                  struct rpc_clnt **clnt)
 {
        struct nfs_server *server = NFS_SERVER(data->inode);
 
@@ -5037,6 +5038,7 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess
        data->res.server = server;
        msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];
        nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);
+       nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_COMMIT, clnt, msg);
 }
 
 struct nfs4_renewdata {

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index aaad337962d0a7c69db2cef07132c5420fc3ca20..80c350b6232a93ea0bae67cd7124847c73b57889 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -632,7 +632,8 @@ static void nfs_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit
 }
 
 static void
-nfs_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg)
+nfs_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg,
+                       struct rpc_clnt **clnt)
 {
        BUG();
 }

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index b633583ca2683271910e01208c2cf6e967790453..a057b4f45a468dd695202f5462787cfd8d2dc0fa 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1666,14 +1666,11 @@ int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,
                .priority = priority,
        };
        /* Set up the initial task struct.  */
-       nfs_ops->commit_setup(data, &msg);
+       nfs_ops->commit_setup(data, &msg, &task_setup_data.rpc_client);
        trace_nfs_initiate_commit(data);
 
        dprintk("NFS: initiated commit call\n");
 
-       nfs4_state_protect(NFS_SERVER(data->inode)->nfs_client,
-               NFS_SP4_MACH_CRED_COMMIT, &task_setup_data.rpc_client, &msg);
-
        task = rpc_run_task(&task_setup_data);
        if (IS_ERR(task))
                return PTR_ERR(task);

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 1009269e1a49f80396756a059e66c20feb105acd..52b481dfd61e4cf03973e2501509b356d5b30c69 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1623,7 +1623,8 @@ struct nfs_rpc_ops {
        void    (*write_setup)(struct nfs_pgio_header *, struct rpc_message *,
                                struct rpc_clnt **);
        int     (*write_done)(struct rpc_task *, struct nfs_pgio_header *);
-       void    (*commit_setup) (struct nfs_commit_data *, struct rpc_message *);
+       void    (*commit_setup) (struct nfs_commit_data *, struct rpc_message *,
+                               struct rpc_clnt **);
        void    (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);
        int     (*commit_done) (struct rpc_task *, struct nfs_commit_data *);
        int     (*lock)(struct file *, int, struct file_lock *);