Commit 1e3987c3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Rename nfs4_copy_stateid() 



It is really a function for selecting the correct stateid to use in a
read or write situation.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ea9d23f5

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ extern void nfs41_handle_server_scope(struct nfs_client *, 
				      struct server_scope **);

extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);

extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);

extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t, pid_t);

extern void nfs4_select_rw_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t, pid_t);



extern struct nfs_seqid *nfs_alloc_seqid(struct nfs_seqid_counter *counter, gfp_t gfp_mask);

extern int nfs_wait_on_sequence(struct nfs_seqid *seqid, struct rpc_task *task);

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -1922,7 +1922,7 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, 
	if (nfs4_copy_delegation_stateid(&arg.stateid, inode)) {

		/* Use that stateid */

	} else if (state != NULL) {

		nfs4_copy_stateid(&arg.stateid, state, current->files, current->tgid);

		nfs4_select_rw_stateid(&arg.stateid, state, current->files, current->tgid);

	} else

		memcpy(&arg.stateid, &zero_stateid, sizeof(arg.stateid));

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl) 
 * Byte-range lock aware utility to initialize the stateid of read/write

 * requests.

 */

void nfs4_copy_stateid(nfs4_stateid *dst, struct nfs4_state *state, fl_owner_t fl_owner, pid_t fl_pid)

void nfs4_select_rw_stateid(nfs4_stateid *dst, struct nfs4_state *state, fl_owner_t fl_owner, pid_t fl_pid)

{

	struct nfs4_lock_state *lsp;

	int seq;

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ static void encode_open_stateid(struct xdr_stream *xdr, const struct nfs_open_co 
	nfs4_stateid stateid;



	if (ctx->state != NULL) {

		nfs4_copy_stateid(&stateid, ctx->state, l_ctx->lockowner, l_ctx->pid);

		nfs4_select_rw_stateid(&stateid, ctx->state, l_ctx->lockowner, l_ctx->pid);

		if (zero_seqid)

			stateid.stateid.seqid = 0;

		encode_nfs4_stateid(xdr, &stateid);