Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / fs / ocfs2 / refcounttree.c

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 1baffaadda418b18cb68ae966cf72fa693aa4e58..998b17eda09d807b2b1d2ccc0b94cdc2a45974a1 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4407,7 +4407,7 @@ static int ocfs2_vfs_reflink(struct dentry *old_dentry, struct inode *dir,
         * rights to do so.
         */
        if (preserve) {
-               if ((current_fsuid() != inode->i_uid) && !capable(CAP_CHOWN))
+               if (!uid_eq(current_fsuid(), inode->i_uid) && !capable(CAP_CHOWN))
                        return -EPERM;
                if (!in_group_p(inode->i_gid) && !capable(CAP_CHOWN))
                        return -EPERM;