Commit d19a7af7 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chuck Lever

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 7f024fcd ("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: 7f024fcd ("Keep read and write fds with each nlm_file")
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
[ cel: fixed checkpatch.pl nit ]
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 6e7f90d1
...@@ -180,6 +180,7 @@ static int nlm_unlock_files(struct nlm_file *file) ...@@ -180,6 +180,7 @@ static int nlm_unlock_files(struct nlm_file *file)
{ {
struct file_lock lock; struct file_lock lock;
locks_init_lock(&lock);
lock.fl_type = F_UNLCK; lock.fl_type = F_UNLCK;
lock.fl_start = 0; lock.fl_start = 0;
lock.fl_end = OFFSET_MAX; lock.fl_end = OFFSET_MAX;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment