1 files changed, 23 insertions, 40 deletions

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f8d46df8fa9e..3e58a6f697dd 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1653,19 +1653,12 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)
 static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
 {
         struct f2fs_inode_info *fi = F2FS_I(inode);
-        u32 oldflags;
 
         /* Is it quota file? Do not allow user to mess with it */
         if (IS_NOQUOTA(inode))
                 return -EPERM;
 
-        oldflags = fi->i_flags;
-
-        if ((iflags ^ oldflags) & (F2FS_APPEND_FL | F2FS_IMMUTABLE_FL))
-                if (!capable(CAP_LINUX_IMMUTABLE))
-                        return -EPERM;
-
-        fi->i_flags = iflags | (oldflags & ~mask);
+        fi->i_flags = iflags | (fi->i_flags & ~mask);
 
         if (fi->i_flags & F2FS_PROJINHERIT_FL)
                 set_inode_flag(inode, FI_PROJ_INHERIT);
@@ -1770,7 +1763,8 @@ static int f2fs_ioc_getflags(struct file *filp, unsigned long arg)
 static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 {
         struct inode *inode = file_inode(filp);
-        u32 fsflags;
+        struct f2fs_inode_info *fi = F2FS_I(inode);
+        u32 fsflags, old_fsflags;
         u32 iflags;
         int ret;
 
@@ -1794,8 +1788,14 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
         inode_lock(inode);
 
+        old_fsflags = f2fs_iflags_to_fsflags(fi->i_flags);
+        ret = vfs_ioc_setflags_prepare(inode, old_fsflags, fsflags);
+        if (ret)
+                goto out;
+
         ret = f2fs_setflags_common(inode, iflags,
                         f2fs_fsflags_to_iflags(F2FS_SETTABLE_FS_FL));
+out:
         inode_unlock(inode);
         mnt_drop_write_file(filp);
         return ret;
@@ -2855,52 +2855,32 @@ static inline u32 f2fs_xflags_to_iflags(u32 xflags)
         return iflags;
 }
 
-static int f2fs_ioc_fsgetxattr(struct file *filp, unsigned long arg)
+static void f2fs_fill_fsxattr(struct inode *inode, struct fsxattr *fa)
 {
-        struct inode *inode = file_inode(filp);
         struct f2fs_inode_info *fi = F2FS_I(inode);
-        struct fsxattr fa;
 
-        memset(&fa, 0, sizeof(struct fsxattr));
-        fa.fsx_xflags = f2fs_iflags_to_xflags(fi->i_flags);
+        simple_fill_fsxattr(fa, f2fs_iflags_to_xflags(fi->i_flags));
 
         if (f2fs_sb_has_project_quota(F2FS_I_SB(inode)))
-                fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
-                                                        fi->i_projid);
-
-        if (copy_to_user((struct fsxattr __user *)arg, &fa, sizeof(fa)))
-                return -EFAULT;
-        return 0;
+                fa->fsx_projid = from_kprojid(&init_user_ns, fi->i_projid);
 }
 
-static int f2fs_ioctl_check_project(struct inode *inode, struct fsxattr *fa)
+static int f2fs_ioc_fsgetxattr(struct file *filp, unsigned long arg)
 {
-        /*
-         * Project Quota ID state is only allowed to change from within the init
-         * namespace. Enforce that restriction only if we are trying to change
-         * the quota ID state. Everything else is allowed in user namespaces.
-         */
-        if (current_user_ns() == &init_user_ns)
-                return 0;
+        struct inode *inode = file_inode(filp);
+        struct fsxattr fa;
 
-        if (__kprojid_val(F2FS_I(inode)->i_projid) != fa->fsx_projid)
-                return -EINVAL;
-
-        if (F2FS_I(inode)->i_flags & F2FS_PROJINHERIT_FL) {
-                if (!(fa->fsx_xflags & FS_XFLAG_PROJINHERIT))
-                        return -EINVAL;
-        } else {
-                if (fa->fsx_xflags & FS_XFLAG_PROJINHERIT)
-                        return -EINVAL;
-        }
+        f2fs_fill_fsxattr(inode, &fa);
 
+        if (copy_to_user((struct fsxattr __user *)arg, &fa, sizeof(fa)))
+                return -EFAULT;
         return 0;
 }
 
 static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)
 {
         struct inode *inode = file_inode(filp);
-        struct fsxattr fa;
+        struct fsxattr fa, old_fa;
         u32 iflags;
         int err;
 
@@ -2923,9 +2903,12 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)
                 return err;
 
         inode_lock(inode);
-        err = f2fs_ioctl_check_project(inode, &fa);
+
+        f2fs_fill_fsxattr(inode, &old_fa);
+        err = vfs_ioc_fssetxattr_check(inode, &old_fa, &fa);
         if (err)
                 goto out;
+
         err = f2fs_setflags_common(inode, iflags,
                         f2fs_xflags_to_iflags(F2FS_SUPPORTED_XFLAGS));
         if (err)