Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 5cbc8e6e93905b1a8f880dfcf82065442e0933e9..50370599e37104708b95ede3a627052cc0d910d3 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2014,7 +2014,7 @@ bool inode_owner_or_capable(const struct inode *inode)
                return true;
 
        ns = current_user_ns();
-       if (ns_capable(ns, CAP_FOWNER) && kuid_has_mapping(ns, inode->i_uid))
+       if (kuid_has_mapping(ns, inode->i_uid) && ns_capable(ns, CAP_FOWNER))
                return true;
        return false;
 }