Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 0d68f1f817996bef79ab16a4b0c51ceecd409d65..4f441e46cef47bc67b08a3e82b78f389dfbbf818 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1446,7 +1446,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
        struct inode *inode = dentry->d_inode;
        int error;
 
-       if ((current_fsuid() != inode->i_uid) && !capable(CAP_LEASE))
+       if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CAP_LEASE))
                return -EACCES;
        if (!S_ISREG(inode->i_mode))
                return -EINVAL;