mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
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: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@vger.kernel.org
This commit is contained in:
parent
ca138f368a
commit
05ffe24f52
1 changed files with 7 additions and 2 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue