diff options
| author | Jeff Layton <jlayton@kernel.org> | 2022-11-11 20:36:38 +0100 |
|---|---|---|
| committer | Chuck Lever <cel@kernel.org> | 2022-12-10 17:01:11 +0100 |
| commit | 9f27783b4dd235ef3c8dbf69fc6322777450323c (patch) | |
| tree | c85a5bedde5bdf437171e8fb56f6ac13073ae772 /fs/lockd | |
| parent | lockd: ensure we use the correct file descriptor when unlocking (diff) | |
| download | linux-9f27783b4dd235ef3c8dbf69fc6322777450323c.tar.xz linux-9f27783b4dd235ef3c8dbf69fc6322777450323c.zip | |
lockd: fix file selection in nlmsvc_cancel_blocked
We currently do a lock_to_openmode call based on the arguments from the
NLM_UNLOCK call, but that will always set the fl_type of the lock to
F_UNLCK, and the O_RDONLY descriptor is always chosen.
Fix it to use the file_lock from the block instead.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/svclock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 9eae99e08e69..4e30f3c50970 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -699,9 +699,10 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l block = nlmsvc_lookup_block(file, lock); mutex_unlock(&file->f_mutex); if (block != NULL) { - mode = lock_to_openmode(&lock->fl); - vfs_cancel_lock(block->b_file->f_file[mode], - &block->b_call->a_args.lock.fl); + struct file_lock *fl = &block->b_call->a_args.lock.fl; + + mode = lock_to_openmode(fl); + vfs_cancel_lock(block->b_file->f_file[mode], fl); status = nlmsvc_unlink_block(block); nlmsvc_release_block(block); } |