f2fs: fix to relocate check condition in f2fs_fallocate()

compress and pinfile flag should be checked after inode lock held to
avoid race condition, fix it.

Fixes: 4c8ff7095bef ("f2fs: support data compression")
Fixes: 5fed0be8583f ("f2fs: do not allow partial truncation on pinned file")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f88dff065ff18226d1020760294cfabe2b4e69a9..fc3d4d69e72c0e258e95100698a1b1cdcc340d3a 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1820,15 +1820,6 @@ static long f2fs_fallocate(struct file *file, int mode,
                (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)))
                return -EOPNOTSUPP;
 
-       /*
-        * Pinned file should not support partial truncation since the block
-        * can be used by applications.
-        */
-       if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) &&
-               (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE |
-                       FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE)))
-               return -EOPNOTSUPP;
-
        if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |
                        FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE |
                        FALLOC_FL_INSERT_RANGE))
@@ -1836,6 +1827,17 @@ static long f2fs_fallocate(struct file *file, int mode,
 
        inode_lock(inode);
 
+       /*
+        * Pinned file should not support partial truncation since the block
+        * can be used by applications.
+        */
+       if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) &&
+               (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE |
+                       FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE))) {
+               ret = -EOPNOTSUPP;
+               goto out;
+       }
+
        ret = file_modified(file);
        if (ret)
                goto out;