f2fs: allow to clear F2FS_COMPR_FL flag
authorChao Yu <yuchao0@huawei.com>
Tue, 10 Mar 2020 12:50:09 +0000 (20:50 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Wed, 11 Mar 2020 15:25:38 +0000 (08:25 -0700)
If regular inode has no compressed cluster, allow using 'chattr -c'
to remove its compress flag, recovering it to a non-compressed file.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index 07f6367321993fea3a08801885363acf7b28f668..afc9a1a5a884fba206b2c439165ca45f5c8b1d8d 100644 (file)
@@ -1817,10 +1817,10 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
        }
 
        if ((iflags ^ masked_flags) & F2FS_COMPR_FL) {
-               if (S_ISREG(inode->i_mode) &&
-                       (masked_flags & F2FS_COMPR_FL || i_size_read(inode) ||
-                                               F2FS_HAS_BLOCKS(inode)))
-                       return -EINVAL;
+               if (S_ISREG(inode->i_mode) && (masked_flags & F2FS_COMPR_FL)) {
+                       if (f2fs_disable_compressed_file(inode))
+                               return -EINVAL;
+               }
                if (iflags & F2FS_NOCOMP_FL)
                        return -EINVAL;
                if (iflags & F2FS_COMPR_FL) {