2023-11-30 09:14:04

by 李扬韬

Subject: [PATCH] f2fs: compress: do cleanup in f2fs_truncate_partial_cluster()

Remove unnecessary code logic.

Signed-off-by: Yangtao Li <[email protected]>
---
fs/f2fs/compress.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 36e5dab6baae..de55c266509a 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1170,7 +1170,9 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
int log_cluster_size = F2FS_I(inode)->i_log_cluster_size;
pgoff_t start_idx = from >> (PAGE_SHIFT + log_cluster_size) <<
log_cluster_size;
- int err;
+ struct page **rpages = fsdata;
+ int cluster_size = F2FS_I(inode)->i_cluster_size;
+ int err, i;

err = f2fs_is_compressed_cluster(inode, start_idx);
if (err < 0)
@@ -1190,25 +1192,19 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
if (err <= 0)
return err;

- if (err > 0) {
- struct page **rpages = fsdata;
- int cluster_size = F2FS_I(inode)->i_cluster_size;
- int i;
-
- for (i = cluster_size - 1; i >= 0; i--) {
- loff_t start = rpages[i]->index << PAGE_SHIFT;
+ for (i = cluster_size - 1; i >= 0; i--) {
+ loff_t start = rpages[i]->index << PAGE_SHIFT;

- if (from <= start) {
- zero_user_segment(rpages[i], 0, PAGE_SIZE);
- } else {
- zero_user_segment(rpages[i], from - start,
- PAGE_SIZE);
- break;
- }
+ if (from <= start) {
+ zero_user_segment(rpages[i], 0, PAGE_SIZE);
+ } else {
+ zero_user_segment(rpages[i], from - start,
+ PAGE_SIZE);
+ break;
}
-
- f2fs_compress_write_end(inode, fsdata, start_idx, true);
}
+
+ f2fs_compress_write_end(inode, fsdata, start_idx, true);
return 0;
}

--
2.39.0

2023-12-09 09:07:59

by Chao Yu

Subject: Re: [PATCH] f2fs: compress: do cleanup in f2fs_truncate_partial_cluster()

On 2023/11/30 17:23, Yangtao Li wrote:
> Remove unnecessary code logic.
>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> fs/f2fs/compress.c | 30 +++++++++++++-----------------
> 1 file changed, 13 insertions(+), 17 deletions(-)
>
> diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
> index 36e5dab6baae..de55c266509a 100644
> --- a/fs/f2fs/compress.c
> +++ b/fs/f2fs/compress.c
> @@ -1170,7 +1170,9 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
> int log_cluster_size = F2FS_I(inode)->i_log_cluster_size;
> pgoff_t start_idx = from >> (PAGE_SHIFT + log_cluster_size) <<
> log_cluster_size;
> - int err;
> + struct page **rpages = fsdata;

fsdata is NULL here.

Thanks,

> + int cluster_size = F2FS_I(inode)->i_cluster_size;
> + int err, i;
>
> err = f2fs_is_compressed_cluster(inode, start_idx);
> if (err < 0)
> @@ -1190,25 +1192,19 @@ int f2fs_truncate_partial_cluster(struct inode *inode, u64 from, bool lock)
> if (err <= 0)
> return err;
>
> - if (err > 0) {
> - struct page **rpages = fsdata;
> - int cluster_size = F2FS_I(inode)->i_cluster_size;
> - int i;
> -
> - for (i = cluster_size - 1; i >= 0; i--) {
> - loff_t start = rpages[i]->index << PAGE_SHIFT;
> + for (i = cluster_size - 1; i >= 0; i--) {
> + loff_t start = rpages[i]->index << PAGE_SHIFT;
>
> - if (from <= start) {
> - zero_user_segment(rpages[i], 0, PAGE_SIZE);
> - } else {
> - zero_user_segment(rpages[i], from - start,
> - PAGE_SIZE);
> - break;
> - }
> + if (from <= start) {
> + zero_user_segment(rpages[i], 0, PAGE_SIZE);
> + } else {
> + zero_user_segment(rpages[i], from - start,
> + PAGE_SIZE);
> + break;
> }
> -
> - f2fs_compress_write_end(inode, fsdata, start_idx, true);
> }
> +
> + f2fs_compress_write_end(inode, fsdata, start_idx, true);
> return 0;
> }
>