UBUNTU: rebase to v4.10-rc2

[mirror_ubuntu-zesty-kernel.git] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index cb9b02940805cba8d30720c0af63ec5174931c7e..0e16d6fd0472f9a4172d1d06753578d9213f5ed5 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -546,7 +546,7 @@ static int ioctl_fsfreeze(struct file *filp)
 {
        struct super_block *sb = file_inode(filp)->i_sb;
 
-       if (!capable(CAP_SYS_ADMIN))
+       if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN))
                return -EPERM;
 
        /* If filesystem doesn't support freeze feature, return. */
@@ -563,7 +563,7 @@ static int ioctl_fsthaw(struct file *filp)
 {
        struct super_block *sb = file_inode(filp)->i_sb;
 
-       if (!capable(CAP_SYS_ADMIN))
+       if (!ns_capable(sb->s_user_ns, CAP_SYS_ADMIN))
                return -EPERM;
 
        /* Thaw */