summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-09-01 19:04:48 -0400
committerJeff Layton <jlayton@primarydata.com>2014-10-07 14:06:13 -0400
commit7ca76311fe6c397e9f332e5e6c79e3310d5ee98a (patch)
tree869c239a097a91bde4b62c23151381190374196d /fs/locks.c
parent4d01b7f5e7576858b71cbaa72b541e17a229cb91 (diff)
downloadlinux-stable-7ca76311fe6c397e9f332e5e6c79e3310d5ee98a.tar.gz
linux-stable-7ca76311fe6c397e9f332e5e6c79e3310d5ee98a.tar.bz2
linux-stable-7ca76311fe6c397e9f332e5e6c79e3310d5ee98a.zip
locks: set fl_owner for leases to filp instead of current->files
Like flock locks, leases are owned by the file description. Now that the i_have_this_lease check in __break_lease is gone, we don't actually use the fl_owner for leases for anything. So, it's now safe to set this more appropriately to the same value as the fl_file. While we're at it, fix up the comments over the fl_owner_t definition since they're rather out of date. Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index aed4a957d232..314135ad820b 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -465,7 +465,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 = current->files;
+ fl->fl_owner = filp;
fl->fl_pid = current->tgid;
fl->fl_file = filp;