1 files changed, 4 insertions, 6 deletions

diff --git a/fs/inode.c b/fs/inode.c
index e3ef2573cbdf..da93f7d160d4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -135,8 +135,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
         inode->i_fop = &empty_fops;
         inode->__i_nlink = 1;
         inode->i_opflags = 0;
-        inode->i_uid = 0;
-        inode->i_gid = 0;
+        i_uid_write(inode, 0);
+        i_gid_write(inode, 0);
         atomic_set(&inode->i_writecount, 0);
         inode->i_size = 0;
         inode->i_blocks = 0;
@@ -1734,11 +1734,9 @@ EXPORT_SYMBOL(inode_init_owner);
  */
 bool inode_owner_or_capable(const struct inode *inode)
 {
-        struct user_namespace *ns = inode_userns(inode);
-
-        if (current_user_ns() == ns && current_fsuid() == inode->i_uid)
+        if (uid_eq(current_fsuid(), inode->i_uid))
                 return true;
-        if (ns_capable(ns, CAP_FOWNER))
+        if (inode_capable(inode, CAP_FOWNER))
                 return true;
         return false;
 }