Merge tag 'fs.idmapped.v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs...

[linux-2.6-block.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 7852e946fdf4327824e65d1586668bec757485b4..b622be119706a1a643e5b382af576e693d0ca4b8 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -48,7 +48,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
 
        /* O_NOATIME can only be set by the owner or superuser */
        if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
-               if (!inode_owner_or_capable(file_mnt_user_ns(filp), inode))
+               if (!inode_owner_or_capable(file_mnt_idmap(filp), inode))
                        return -EPERM;
 
        /* required for strict SunOS emulation */