diff options
| author | Jeff Layton <jlayton@kernel.org> | 2022-07-11 14:30:13 -0400 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2022-07-11 15:49:56 -0400 |
| commit | aec158242b87a43d83322e99bc71ab4428e5ab79 (patch) | |
| tree | 2d284f31425edc83e77ef441a8516d56de361292 /fs | |
| parent | 5b2f3e0777da2a5dd62824bbe2fdab1d12caaf8f (diff) | |
| download | linux-stable-aec158242b87a43d83322e99bc71ab4428e5ab79.tar.gz linux-stable-aec158242b87a43d83322e99bc71ab4428e5ab79.tar.bz2 linux-stable-aec158242b87a43d83322e99bc71ab4428e5ab79.zip | |
lockd: set fl_owner when unlocking files
Unlocking a POSIX lock on an inode with vfs_lock_file only works if
the owner matches. Ensure we set it in the request.
Cc: J. Bruce Fields <bfields@fieldses.org>
Fixes: 7f024fcd5c97 ("Keep read and write fds with each nlm_file")
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/svcsubs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index 0a22a2faf552..b2f277727469 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -176,7 +176,7 @@ nlm_delete_file(struct nlm_file *file) } } -static int nlm_unlock_files(struct nlm_file *file) +static int nlm_unlock_files(struct nlm_file *file, fl_owner_t owner) { struct file_lock lock; @@ -184,6 +184,7 @@ static int nlm_unlock_files(struct nlm_file *file) lock.fl_type = F_UNLCK; lock.fl_start = 0; lock.fl_end = OFFSET_MAX; + lock.fl_owner = owner; if (file->f_file[O_RDONLY] && vfs_lock_file(file->f_file[O_RDONLY], F_SETLK, &lock, NULL)) goto out_err; @@ -225,7 +226,7 @@ again: if (match(lockhost, host)) { spin_unlock(&flctx->flc_lock); - if (nlm_unlock_files(file)) + if (nlm_unlock_files(file, fl->fl_owner)) return 1; goto again; } |