Commit fa18d87c authored by Zhiguo Niu's avatar Zhiguo Niu Committed by Jaegeuk Kim

f2fs: add REQ_TIME time update for some user behaviors

some user behaviors requested filesystem operations, which
will cause filesystem not idle.
Meanwhile adjust some f2fs_update_time(REQ_TIME) positions.
Signed-off-by: default avatarZhiguo Niu <zhiguo.niu@unisoc.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b084403c
...@@ -2375,13 +2375,14 @@ static bool uuid_is_nonzero(__u8 u[16]) ...@@ -2375,13 +2375,14 @@ static bool uuid_is_nonzero(__u8 u[16])
static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg) static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg)
{ {
struct inode *inode = file_inode(filp); struct inode *inode = file_inode(filp);
int ret;
if (!f2fs_sb_has_encrypt(F2FS_I_SB(inode))) if (!f2fs_sb_has_encrypt(F2FS_I_SB(inode)))
return -EOPNOTSUPP; return -EOPNOTSUPP;
ret = fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
f2fs_update_time(F2FS_I_SB(inode), REQ_TIME); f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
return ret;
return fscrypt_ioctl_set_policy(filp, (const void __user *)arg);
} }
static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg) static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg)
...@@ -2809,7 +2810,8 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg) ...@@ -2809,7 +2810,8 @@ static int f2fs_ioc_defragment(struct file *filp, unsigned long arg)
err = f2fs_defragment_range(sbi, filp, &range); err = f2fs_defragment_range(sbi, filp, &range);
mnt_drop_write_file(filp); mnt_drop_write_file(filp);
f2fs_update_time(sbi, REQ_TIME); if (range.len)
f2fs_update_time(sbi, REQ_TIME);
if (err < 0) if (err < 0)
return err; return err;
...@@ -3622,6 +3624,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) ...@@ -3622,6 +3624,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
filemap_invalidate_unlock(inode->i_mapping); filemap_invalidate_unlock(inode->i_mapping);
f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
out: out:
if (released_blocks)
f2fs_update_time(sbi, REQ_TIME);
inode_unlock(inode); inode_unlock(inode);
mnt_drop_write_file(filp); mnt_drop_write_file(filp);
...@@ -3790,6 +3794,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) ...@@ -3790,6 +3794,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
f2fs_mark_inode_dirty_sync(inode, true); f2fs_mark_inode_dirty_sync(inode, true);
} }
unlock_inode: unlock_inode:
if (reserved_blocks)
f2fs_update_time(sbi, REQ_TIME);
inode_unlock(inode); inode_unlock(inode);
mnt_drop_write_file(filp); mnt_drop_write_file(filp);
...@@ -3986,6 +3992,7 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg) ...@@ -3986,6 +3992,7 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg)
if (len) if (len)
ret = f2fs_secure_erase(prev_bdev, inode, prev_index, ret = f2fs_secure_erase(prev_bdev, inode, prev_index,
prev_block, len, range.flags); prev_block, len, range.flags);
f2fs_update_time(sbi, REQ_TIME);
out: out:
filemap_invalidate_unlock(mapping); filemap_invalidate_unlock(mapping);
f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
...@@ -4193,6 +4200,7 @@ static int f2fs_ioc_decompress_file(struct file *filp) ...@@ -4193,6 +4200,7 @@ static int f2fs_ioc_decompress_file(struct file *filp)
if (ret) if (ret)
f2fs_warn(sbi, "%s: The file might be partially decompressed (errno=%d). Please delete the file.", f2fs_warn(sbi, "%s: The file might be partially decompressed (errno=%d). Please delete the file.",
__func__, ret); __func__, ret);
f2fs_update_time(sbi, REQ_TIME);
out: out:
inode_unlock(inode); inode_unlock(inode);
file_end_write(filp); file_end_write(filp);
...@@ -4270,6 +4278,7 @@ static int f2fs_ioc_compress_file(struct file *filp) ...@@ -4270,6 +4278,7 @@ static int f2fs_ioc_compress_file(struct file *filp)
if (ret) if (ret)
f2fs_warn(sbi, "%s: The file might be partially compressed (errno=%d). Please delete the file.", f2fs_warn(sbi, "%s: The file might be partially compressed (errno=%d). Please delete the file.",
__func__, ret); __func__, ret);
f2fs_update_time(sbi, REQ_TIME);
out: out:
inode_unlock(inode); inode_unlock(inode);
file_end_write(filp); file_end_write(filp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment