]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: fix to use mnt_{want,drop}_write_file replace file_{start,end}_wrtie
authorZhiguo Niu <zhiguo.niu@unisoc.com>
Thu, 13 Jun 2024 09:35:33 +0000 (17:35 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 18 Jun 2024 02:32:18 +0000 (02:32 +0000)
mnt_{want,drop}_write_file is more suitable than
file_{start,end}_wrtie and also is consistent with
other ioctl operations.

Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index c50213da474d74f163fe2e9a48d420c3ebaeaf56..e4a7cff007961f0a6e991a752f7d6cef8055ce26 100644 (file)
@@ -3935,7 +3935,9 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)
                         IS_ENCRYPTED(inode) && f2fs_is_multi_device(sbi)))
                return -EOPNOTSUPP;
 
-       file_start_write(filp);
+       ret = mnt_want_write_file(filp);
+       if (ret)
+               return ret;
        inode_lock(inode);
 
        if (f2fs_is_atomic_file(inode) || f2fs_compressed_file(inode) ||
@@ -4061,7 +4063,7 @@ out:
        f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 err:
        inode_unlock(inode);
-       file_end_write(filp);
+       mnt_drop_write_file(filp);
 
        return ret;
 }
@@ -4115,7 +4117,9 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
                option.algorithm >= COMPRESS_MAX)
                return -EINVAL;
 
-       file_start_write(filp);
+       ret = mnt_want_write_file(filp);
+       if (ret)
+               return ret;
        inode_lock(inode);
 
        f2fs_down_write(&F2FS_I(inode)->i_sem);
@@ -4154,7 +4158,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
 out:
        f2fs_up_write(&F2FS_I(inode)->i_sem);
        inode_unlock(inode);
-       file_end_write(filp);
+       mnt_drop_write_file(filp);
 
        return ret;
 }
@@ -4211,7 +4215,9 @@ static int f2fs_ioc_decompress_file(struct file *filp)
 
        f2fs_balance_fs(sbi, true);
 
-       file_start_write(filp);
+       ret = mnt_want_write_file(filp);
+       if (ret)
+               return ret;
        inode_lock(inode);
 
        if (!f2fs_is_compress_backend_ready(inode)) {
@@ -4266,7 +4272,7 @@ static int f2fs_ioc_decompress_file(struct file *filp)
        f2fs_update_time(sbi, REQ_TIME);
 out:
        inode_unlock(inode);
-       file_end_write(filp);
+       mnt_drop_write_file(filp);
 
        return ret;
 }
@@ -4288,7 +4294,9 @@ static int f2fs_ioc_compress_file(struct file *filp)
 
        f2fs_balance_fs(sbi, true);
 
-       file_start_write(filp);
+       ret = mnt_want_write_file(filp);
+       if (ret)
+               return ret;
        inode_lock(inode);
 
        if (!f2fs_is_compress_backend_ready(inode)) {
@@ -4344,7 +4352,7 @@ static int f2fs_ioc_compress_file(struct file *filp)
        f2fs_update_time(sbi, REQ_TIME);
 out:
        inode_unlock(inode);
-       file_end_write(filp);
+       mnt_drop_write_file(filp);
 
        return ret;
 }