diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 09:58:22 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 13:40:57 -0700 |
| commit | e05f7a049389792dd6decdc3861413a3bcd8f051 (patch) | |
| tree | 620b6c4bd80621989f7088356981dd7df03670fd /fs | |
| parent | 7e5866d82dc2d896f6af0bc1af33fa007172ae83 (diff) | |
locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
commit e0b760ff71be168d4e623f7c3612e98902ab93e9 upstream.
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.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -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 717fbc404e6b..be530f9b13ce 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1595,7 +1595,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); |