Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ae1ee2 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent fb91fb0e

fs/nfs/nfs3proc.c

+2 −1
Original line number Diff line number Diff line
@@ -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];

}

fs/nfs/nfs4proc.c

+3 −1
Original line number Diff line number Diff line
@@ -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 {

fs/nfs/proc.c

+2 −1
Original line number Diff line number Diff line
@@ -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();

}

fs/nfs/write.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

include/linux/nfs_xdr.h

+2 −1
Original line number Diff line number Diff line
@@ -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 *);