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

Commit 05ffe24f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Ensure that the LOCK code sets exception->inode 



All callers of nfs4_handle_exception() that need to handle
NFS4ERR_OPENMODE correctly should set exception->inode

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
parent ca138f36

fs/nfs/nfs4proc.c

+7 −2
Original line number Diff line number Diff line
@@ -4558,7 +4558,9 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f 
static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)

{

	struct nfs_server *server = NFS_SERVER(state->inode);

	struct nfs4_exception exception = { };

	struct nfs4_exception exception = {

		.inode = state->inode,

	};

	int err;



	do {
@@ -4576,7 +4578,9 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request 
static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)

{

	struct nfs_server *server = NFS_SERVER(state->inode);

	struct nfs4_exception exception = { };

	struct nfs4_exception exception = {

		.inode = state->inode,

	};

	int err;



	err = nfs4_set_lock_state(state, request);
@@ -4676,6 +4680,7 @@ static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock * 
{

	struct nfs4_exception exception = {

		.state = state,

		.inode = state->inode,

	};

	int err;