diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 15:58:22 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 15:58:22 +0200 |
| commit | e0b760ff71be168d4e623f7c3612e98902ab93e9 (patch) | |
| tree | 3b25448d474916915b1c932004e248d95c5da65e | |
| parent | Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-e0b760ff71be168d4e623f7c3612e98902ab93e9.tar.xz linux-e0b760ff71be168d4e623f7c3612e98902ab93e9.zip | |
locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
The argument to locks_unlink_lock can't be just any pointer to a
pointer. It must be a pointer to the fl_next field in the previous
lock in the list.
Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
| -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 cb66fb05ad4a..bb08857f90b5 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1619,7 +1619,7 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp smp_mb(); error = check_conflicting_open(dentry, arg); if (error) - locks_unlink_lock(flp); + locks_unlink_lock(before); out: if (is_deleg) mutex_unlock(&inode->i_mutex); |