f2fs: fix to disable compression on directory

It needs to call f2fs_disable_compressed_file() to disable
compression on directory.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c44afc5986386fb414aecaf4a16a2da3c5ddb7d9..c84442eefc56d25211c9e5999e738830f3085266 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3849,10 +3849,12 @@ static inline u64 f2fs_disable_compressed_file(struct inode *inode)
 
        if (!f2fs_compressed_file(inode))
                return 0;
-       if (get_dirty_pages(inode))
-               return 1;
-       if (fi->i_compr_blocks)
-               return fi->i_compr_blocks;
+       if (S_ISREG(inode->i_mode)) {
+               if (get_dirty_pages(inode))
+                       return 1;
+               if (fi->i_compr_blocks)
+                       return fi->i_compr_blocks;
+       }
 
        fi->i_flags &= ~F2FS_COMPR_FL;
        stat_dec_compr_inode(inode);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1476a3bc6317c33371d562c03d40a13ff9002e48..6cb3c6cae7cd03ece66ba7a84214c28d140ed577 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1815,7 +1815,7 @@ 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)) {
+               if (masked_flags & F2FS_COMPR_FL) {
                        if (f2fs_disable_compressed_file(inode))
                                return -EINVAL;
                }