f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted
Chao Yu
maintainerPATCH 1/2 f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted
This patch allows f2fs_ioc_{,de}compress_file() to be interrupted, so that, userspace won't be blocked when manual {,de}compression on large file is interrupted by signal.
--- fs/f2fs/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/f2fs/file.c +12 -0
@@ -4107,6 +4107,12 @@ static int f2fs_ioc_decompress_file(struct file *filp) count -= len; page_idx += len; + +cond_resched (); +if (fatal_signal_pending (current)) { + ret = -EINTR ; +break ; + } }if (!ret)
@@ -4181,6 +4187,12 @@ static int f2fs_ioc_compress_file(struct file *filp) count -= len; page_idx += len; + +cond_resched (); +if (fatal_signal_pending (current)) { + ret = -EINTR ; +break ; + } }if (!ret)
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 2/2 f2fs: compress: don't {,de}compress non-full cluster
f2fs won't compress non-full cluster in tail of file, let's skip dirtying and rewrite such cluster during f2fs_ioc_{,de}compress_file.
--- fs/f2fs/file.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
fs/f2fs/file.c +8 -12
@@ -4092,10 +4092,8 @@ static int f2fs_ioc_decompress_file(struct file *filp) last_idx =DIV_ROUND_UP (i_size_read (inode),PAGE_SIZE ); count = last_idx - page_idx; -while (count) { -int len =min (cluster_size, count); - - ret =redirty_blocks (inode, page_idx, len); +while (count && count >= cluster_size) { + ret =redirty_blocks (inode, page_idx, cluster_size);if (ret <0 )break ;
@@ -4105,8 +4103,8 @@ static int f2fs_ioc_decompress_file(struct file *filp)break ; } - count -= len; - page_idx += len; + count -= cluster_size; + page_idx += cluster_size;cond_resched ();if (fatal_signal_pending (current)) {
@@ -4172,10 +4170,8 @@ static int f2fs_ioc_compress_file(struct file *filp) last_idx =DIV_ROUND_UP (i_size_read (inode),PAGE_SIZE ); count = last_idx - page_idx; -while (count) { -int len =min (cluster_size, count); - - ret =redirty_blocks (inode, page_idx, len); +while (count && count >= cluster_size) { + ret =redirty_blocks (inode, page_idx, cluster_size);if (ret <0 )break ;
@@ -4185,8 +4181,8 @@ static int f2fs_ioc_compress_file(struct file *filp)break ; } - count -= len; - page_idx += len; + count -= cluster_size; + page_idx += cluster_size;cond_resched ();if (fatal_signal_pending (current)) {
Signature · 1 line
2.40.1
Re: [f2fs-dev] [PATCH 1/2] f2fs: allow f2fs_ioc_{, de}compress_file to be interrupted
In reply to Chao YuThis series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 8 lines · On Wed, 12 Jul 2023 04:08:05 +0800 you wrote:
This patch allows f2fs_ioc_{,de}compress_file() to be interrupted, so that, userspace won't be blocked when manual {,de}compression on large file is interrupted by signal.
Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Here is the summary with links:
- [f2fs-dev,1/2] f2fs: allow f2fs_ioc_{, de}compress_file to be interrupted
https://git.kernel.org/jaegeuk/f2fs/c/eb0e30a6f8a7 - [f2fs-dev,2/2] f2fs: compress: don't {, de}compress non-full cluster https://git.kernel.org/jaegeuk/f2fs/c/10c7134ee440
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html