diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2014-06-10 12:29:05 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@poochiereds.net> | 2014-06-10 12:29:05 -0400 |
| commit | 0c27362998a8357f199501aa401e99c51c2eb46e (patch) | |
| tree | 11b922376e2574f0586c452cd74495e2c7728c9d | |
| parent | 962bd40bc30e412828e091bfda041b7547e779c8 (diff) | |
| download | linux-0c27362998a8357f199501aa401e99c51c2eb46e.tar.bz2 | |
locks: set fl_owner for leases back to current->files
This fixes a regression due to commit 130d1f956ab3 (locks: ensure that
fl_owner is always initialized properly in flock and lease codepaths). I
had mistakenly thought that the fl_owner wasn't used in the lease code,
but I missed the place in __break_lease that does use it.
The i_have_this_lease check in generic_add_lease uses it. While I'm not
sure that check is terribly helpful [1], reset it back to using
current->files in order to ensure that there's no behavior change here.
[1]: leases are owned by the file description. It's possible that this
is a threaded program, and the lease breaker and the task that
would handle the signal are different, even if they have the same
file table. So, there is the potential for false positives with
this check.
Fixes: 130d1f956ab3 (locks: ensure that fl_owner is always initialized properly in flock and lease codepaths)
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index da57c9b7e844..717fbc404e6b 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -431,7 +431,7 @@ static int lease_init(struct file *filp, long type, struct file_lock *fl) if (assign_type(fl, type) != 0) return -EINVAL; - fl->fl_owner = (fl_owner_t)filp; + fl->fl_owner = (fl_owner_t)current->files; fl->fl_pid = current->tgid; fl->fl_file = filp; |