Pull file locking bugfx from Jeff Layton: "Just a bugfix for a bug that crept in to v3.15. It's in a rather rare error path, and I'm not aware of anyone having hit it, but it's worth fixing for v3.17" * tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux: locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
Unified · Split
| @@ -1619,7 +1619,7 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp · 1618 unmodified lines | |||
| 1619 | smp_mb(); | 1619 | smp_mb(); |
| 1620 | error = check_conflicting_open(dentry, arg); | 1620 | error = check_conflicting_open(dentry, arg); |
| 1621 | if (error) | 1621 | if (error) |
| 1622 | locks_unlink_lock(flp); | 1622 | locks_unlink_lock(before); |
| 1623 | out: | 1623 | out: |
| 1624 | if (is_deleg) | 1624 | if (is_deleg) |
| 1625 | mutex_unlock(&inode->i_mutex); | 1625 | mutex_unlock(&inode->i_mutex); |