diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2022-01-18 23:00:51 +0100 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2022-01-27 16:45:25 +0100 |
| commit | d19a7af73b5ecaac8168712d18be72b9db166768 (patch) | |
| tree | b04743e6bf80e7af7c5bbde22c7137b3b1a75096 | |
| parent | lockd: fix server crash on reboot of client holding lock (diff) | |
| download | linux-d19a7af73b5ecaac8168712d18be72b9db166768.tar.xz linux-d19a7af73b5ecaac8168712d18be72b9db166768.zip | |
lockd: fix failure to cleanup client locks
In my testing, we're sometimes hitting the request->fl_flags & FL_EXISTS
case in posix_lock_inode, presumably just by random luck since we're not
actually initializing fl_flags here.
This probably didn't matter before commit 7f024fcd5c97 ("Keep read and
write fds with each nlm_file") since we wouldn't previously unlock
unless we knew there were locks.
But now it causes lockd to give up on removing more locks.
We could just initialize fl_flags, but really it seems dubious to be
calling vfs_lock_file with random values in some of the fields.
Fixes: 7f024fcd5c97 ("Keep read and write fds with each nlm_file")
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
[ cel: fixed checkpatch.pl nit ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
| -rw-r--r-- | fs/lockd/svcsubs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index 54c2e42130ca..0a22a2faf552 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -180,6 +180,7 @@ static int nlm_unlock_files(struct nlm_file *file) { struct file_lock lock; + locks_init_lock(&lock); lock.fl_type = F_UNLCK; lock.fl_start = 0; lock.fl_end = OFFSET_MAX; |