redonkable
/
freescale-linux-fslc
1
0
Fork 0
Code Releases Activity

f2fs: compress: fix to assign cc.cluster_idx correctly 

[ Upstream commit 8bfbfb0ddd ]

In f2fs_destroy_compress_ctx(), after f2fs_destroy_compress_ctx(),
cc.cluster_idx will be cleared w/ NULL_CLUSTER, f2fs_cluster_blocks()
may check wrong cluster metadata, fix it.

Fixes: 4c8ff7095b ("f2fs: support data compression")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
pull/345/head^2
Chao Yu 2021-05-10 17:30:32 +08:00 committed by Greg Kroah-Hartman
parent 5639b73fd3
commit a9fc163514
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/f2fs/compress.c
View File

@ -151,13 +151,14 @@ int f2fs_init_compress_ctx(struct compress_ctx *cc)
return cc->rpages ? 0 : -ENOMEM;
}
void f2fs_destroy_compress_ctx(struct compress_ctx *cc)
void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse)
{
page_array_free(cc->inode, cc->rpages, cc->cluster_size);
cc->rpages = NULL;
cc->nr_rpages = 0;
cc->nr_cpages = 0;
cc->cluster_idx = NULL_CLUSTER;
if (!reuse)
cc->cluster_idx = NULL_CLUSTER;
}
void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page)
@ -984,7 +985,7 @@ retry:
ret = f2fs_read_multi_pages(cc, &bio, cc->cluster_size,
&last_block_in_bio, false, true);
f2fs_put_rpages(cc);
f2fs_destroy_compress_ctx(cc);
f2fs_destroy_compress_ctx(cc, true);
if (ret)
goto out;
if (bio)
@ -1011,7 +1012,7 @@ retry:
release_and_retry:
f2fs_put_rpages(cc);
f2fs_unlock_rpages(cc, i + 1);
f2fs_destroy_compress_ctx(cc);
f2fs_destroy_compress_ctx(cc, true);
goto retry;
}
}
@ -1044,7 +1045,7 @@ release_and_retry:
unlock_pages:
f2fs_put_rpages(cc);
f2fs_unlock_rpages(cc, i);
f2fs_destroy_compress_ctx(cc);
f2fs_destroy_compress_ctx(cc, true);
out:
return ret;
}
@ -1080,7 +1081,7 @@ bool f2fs_compress_write_end(struct inode *inode, void *fsdata,
set_cluster_dirty(&cc);
f2fs_put_rpages_wbc(&cc, NULL, false, 1);
f2fs_destroy_compress_ctx(&cc);
f2fs_destroy_compress_ctx(&cc, false);
return first_index;
}
@ -1299,7 +1300,7 @@ unlock_continue:
f2fs_put_rpages(cc);
page_array_free(cc->inode, cc->cpages, cc->nr_cpages);
cc->cpages = NULL;
f2fs_destroy_compress_ctx(cc);
f2fs_destroy_compress_ctx(cc, false);
return 0;
out_destroy_crypt:
@ -1461,7 +1462,7 @@ write:
err = f2fs_write_raw_pages(cc, submitted, wbc, io_type);
f2fs_put_rpages_wbc(cc, wbc, false, 0);
destroy_out:
f2fs_destroy_compress_ctx(cc);
f2fs_destroy_compress_ctx(cc, false);
return err;
}

6
fs/f2fs/data.c
View File

@ -2419,7 +2419,7 @@ static int f2fs_mpage_readpages(struct inode *inode,
max_nr_pages,
&last_block_in_bio,
rac != NULL, false);
f2fs_destroy_compress_ctx(&cc);
f2fs_destroy_compress_ctx(&cc, false);
if (ret)
goto set_error_page;
}
@ -2464,7 +2464,7 @@ next_page:
max_nr_pages,
&last_block_in_bio,
rac != NULL, false);
f2fs_destroy_compress_ctx(&cc);
f2fs_destroy_compress_ctx(&cc, false);
}
}
#endif
@ -3168,7 +3168,7 @@ next:
}
}
if (f2fs_compressed_file(inode))
f2fs_destroy_compress_ctx(&cc);
f2fs_destroy_compress_ctx(&cc, false);
#endif
if (retry) {
index = 0;

2
fs/f2fs/f2fs.h
View File

@ -3856,7 +3856,7 @@ void f2fs_free_dic(struct decompress_io_ctx *dic);
void f2fs_decompress_end_io(struct page **rpages,
unsigned int cluster_size, bool err, bool verity);
int f2fs_init_compress_ctx(struct compress_ctx *cc);
void f2fs_destroy_compress_ctx(struct compress_ctx *cc);
void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse);
void f2fs_init_compress_info(struct f2fs_sb_info *sbi);
int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi);
void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi);