f2fs: fix wrong check on F2FS_IOC_FSSETXATTR

This fixes the incorrect failure when enabling project quota on casefold-enabled
file.

Cc: Daniel Rosenberg <drosen@google.com>
Cc: kernel-team@android.com
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index b443dc2..07f6367 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1794,12 +1794,15 @@ 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 masked_flags = fi->i_flags & mask;
+
+       f2fs_bug_on(F2FS_I_SB(inode), (iflags & ~mask));
 
        /* Is it quota file? Do not allow user to mess with it */
        if (IS_NOQUOTA(inode))
                return -EPERM;
 
-       if ((iflags ^ fi->i_flags) & F2FS_CASEFOLD_FL) {
+       if ((iflags ^ masked_flags) & F2FS_CASEFOLD_FL) {
                if (!f2fs_sb_has_casefold(F2FS_I_SB(inode)))
                        return -EOPNOTSUPP;
                if (!f2fs_empty_dir(inode))
@@ -1813,9 +1816,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
                        return -EINVAL;
        }
 
-       if ((iflags ^ fi->i_flags) & F2FS_COMPR_FL) {
+       if ((iflags ^ masked_flags) & F2FS_COMPR_FL) {
                if (S_ISREG(inode->i_mode) &&
-                       (fi->i_flags & F2FS_COMPR_FL || i_size_read(inode) ||
+                       (masked_flags & F2FS_COMPR_FL || i_size_read(inode) ||
                                                F2FS_HAS_BLOCKS(inode)))
                        return -EINVAL;
                if (iflags & F2FS_NOCOMP_FL)
@@ -1832,8 +1835,8 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
                        set_compress_context(inode);
                }
        }
-       if ((iflags ^ fi->i_flags) & F2FS_NOCOMP_FL) {
-               if (fi->i_flags & F2FS_COMPR_FL)
+       if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) {
+               if (masked_flags & F2FS_COMPR_FL)
                        return -EINVAL;
        }