Commit cf470c3e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Don't free the nfs4_lock_state until after the release_lockowner 



Otherwise we can end up with sequence id problems if the client reuses
the owner_id before the server has processed the release_lockowner

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

fs/nfs/nfs4_fs.h

+3 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait, boo 
extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);

extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page);

extern void nfs4_release_lockowner(const struct nfs4_lock_state *);

extern int nfs4_release_lockowner(struct nfs4_lock_state *);

extern const struct xattr_handler *nfs4_xattr_handlers[];



#if defined(CONFIG_NFS_V4_1)
@@ -338,6 +338,8 @@ extern void nfs_increment_lock_seqid(int status, struct nfs_seqid *seqid); 
extern void nfs_release_seqid(struct nfs_seqid *seqid);

extern void nfs_free_seqid(struct nfs_seqid *seqid);



extern void nfs4_free_lock_state(struct nfs4_lock_state *lsp);



extern const nfs4_stateid zero_stateid;



/* nfs4xdr.c */

fs/nfs/nfs4proc.c

+20 −11
Original line number Diff line number Diff line
@@ -4745,8 +4745,15 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 
	return err;

}



struct nfs_release_lockowner_data {

	struct nfs4_lock_state *lsp;

	struct nfs_release_lockowner_args args;

};



static void nfs4_release_lockowner_release(void *calldata)

{

	struct nfs_release_lockowner_data *data = calldata;

	nfs4_free_lock_state(data->lsp);

	kfree(calldata);

}
@@ -4754,24 +4761,26 @@ const struct rpc_call_ops nfs4_release_lockowner_ops = { 
	.rpc_release = nfs4_release_lockowner_release,

};



void nfs4_release_lockowner(const struct nfs4_lock_state *lsp)

int nfs4_release_lockowner(struct nfs4_lock_state *lsp)

{

	struct nfs_server *server = lsp->ls_state->owner->so_server;

	struct nfs_release_lockowner_args *args;

	struct nfs_release_lockowner_data *data;

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RELEASE_LOCKOWNER],

	};



	if (server->nfs_client->cl_mvops->minor_version != 0)

		return;

	args = kmalloc(sizeof(*args), GFP_NOFS);

	if (!args)

		return;

	args->lock_owner.clientid = server->nfs_client->cl_clientid;

	args->lock_owner.id = lsp->ls_seqid.owner_id;

	args->lock_owner.s_dev = server->s_dev;

	msg.rpc_argp = args;

	rpc_call_async(server->client, &msg, 0, &nfs4_release_lockowner_ops, args);

		return -EINVAL;

	data = kmalloc(sizeof(*data), GFP_NOFS);

	if (!data)

		return -ENOMEM;

	data->lsp = lsp;

	data->args.lock_owner.clientid = server->nfs_client->cl_clientid;

	data->args.lock_owner.id = lsp->ls_seqid.owner_id;

	data->args.lock_owner.s_dev = server->s_dev;

	msg.rpc_argp = &data->args;

	rpc_call_async(server->client, &msg, 0, &nfs4_release_lockowner_ops, data);

	return 0;

}



#define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"

fs/nfs/nfs4state.c

+5 −3
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f 
	return NULL;

}



static void nfs4_free_lock_state(struct nfs4_lock_state *lsp)

void nfs4_free_lock_state(struct nfs4_lock_state *lsp)

{

	struct nfs_server *server = lsp->ls_state->owner->so_server;
@@ -842,8 +842,10 @@ void nfs4_put_lock_state(struct nfs4_lock_state *lsp) 
	if (list_empty(&state->lock_states))

		clear_bit(LK_STATE_IN_USE, &state->flags);

	spin_unlock(&state->state_lock);

	if (lsp->ls_flags & NFS_LOCK_INITIALIZED)

		nfs4_release_lockowner(lsp);

	if (lsp->ls_flags & NFS_LOCK_INITIALIZED) {

		if (nfs4_release_lockowner(lsp) == 0)

			return;

	}

	nfs4_free_lock_state(lsp);

}