Skip to content

Commit

Permalink
locks: pass correct "before" pointer to locks_unlink_lock in generic_…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Jeff Layton committed Aug 22, 2014
1 parent 5317821 commit e0b760f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e0b760f

Please sign in to comment.