mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
f2fs: clean up {cic,dic}.ref handling
{cic,dic}.ref should be initialized to number of compressed pages, let's initialize it directly rather than doing w/ f2fs_set_compressed_page(). Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
7496affa32
commit
887347a09a
1 changed files with 6 additions and 10 deletions
|
@ -52,7 +52,7 @@ bool f2fs_is_compressed_page(struct page *page)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void f2fs_set_compressed_page(struct page *page,
|
static void f2fs_set_compressed_page(struct page *page,
|
||||||
struct inode *inode, pgoff_t index, void *data, refcount_t *r)
|
struct inode *inode, pgoff_t index, void *data)
|
||||||
{
|
{
|
||||||
SetPagePrivate(page);
|
SetPagePrivate(page);
|
||||||
set_page_private(page, (unsigned long)data);
|
set_page_private(page, (unsigned long)data);
|
||||||
|
@ -60,8 +60,6 @@ static void f2fs_set_compressed_page(struct page *page,
|
||||||
/* i_crypto_info and iv index */
|
/* i_crypto_info and iv index */
|
||||||
page->index = index;
|
page->index = index;
|
||||||
page->mapping = inode->i_mapping;
|
page->mapping = inode->i_mapping;
|
||||||
if (r)
|
|
||||||
refcount_inc(r);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void f2fs_put_compressed_page(struct page *page)
|
static void f2fs_put_compressed_page(struct page *page)
|
||||||
|
@ -478,7 +476,7 @@ void f2fs_decompress_pages(struct bio *bio, struct page *page, bool verity)
|
||||||
vunmap(dic->rbuf);
|
vunmap(dic->rbuf);
|
||||||
out_free_dic:
|
out_free_dic:
|
||||||
if (verity)
|
if (verity)
|
||||||
refcount_add(dic->nr_cpages - 1, &dic->ref);
|
refcount_set(&dic->ref, dic->nr_cpages);
|
||||||
if (!verity)
|
if (!verity)
|
||||||
f2fs_decompress_end_io(dic->rpages, dic->cluster_size,
|
f2fs_decompress_end_io(dic->rpages, dic->cluster_size,
|
||||||
ret, false);
|
ret, false);
|
||||||
|
@ -834,7 +832,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
|
||||||
|
|
||||||
cic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
|
cic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
|
||||||
cic->inode = inode;
|
cic->inode = inode;
|
||||||
refcount_set(&cic->ref, 1);
|
refcount_set(&cic->ref, cc->nr_cpages);
|
||||||
cic->rpages = f2fs_kzalloc(sbi, sizeof(struct page *) <<
|
cic->rpages = f2fs_kzalloc(sbi, sizeof(struct page *) <<
|
||||||
cc->log_cluster_size, GFP_NOFS);
|
cc->log_cluster_size, GFP_NOFS);
|
||||||
if (!cic->rpages)
|
if (!cic->rpages)
|
||||||
|
@ -844,8 +842,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
|
||||||
|
|
||||||
for (i = 0; i < cc->nr_cpages; i++) {
|
for (i = 0; i < cc->nr_cpages; i++) {
|
||||||
f2fs_set_compressed_page(cc->cpages[i], inode,
|
f2fs_set_compressed_page(cc->cpages[i], inode,
|
||||||
cc->rpages[i + 1]->index,
|
cc->rpages[i + 1]->index, cic);
|
||||||
cic, i ? &cic->ref : NULL);
|
|
||||||
fio.compressed_page = cc->cpages[i];
|
fio.compressed_page = cc->cpages[i];
|
||||||
if (fio.encrypted) {
|
if (fio.encrypted) {
|
||||||
fio.page = cc->rpages[i + 1];
|
fio.page = cc->rpages[i + 1];
|
||||||
|
@ -1095,7 +1092,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)
|
||||||
|
|
||||||
dic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
|
dic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
|
||||||
dic->inode = cc->inode;
|
dic->inode = cc->inode;
|
||||||
refcount_set(&dic->ref, 1);
|
refcount_set(&dic->ref, cc->nr_cpages);
|
||||||
dic->cluster_idx = cc->cluster_idx;
|
dic->cluster_idx = cc->cluster_idx;
|
||||||
dic->cluster_size = cc->cluster_size;
|
dic->cluster_size = cc->cluster_size;
|
||||||
dic->log_cluster_size = cc->log_cluster_size;
|
dic->log_cluster_size = cc->log_cluster_size;
|
||||||
|
@ -1119,8 +1116,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
||||||
f2fs_set_compressed_page(page, cc->inode,
|
f2fs_set_compressed_page(page, cc->inode,
|
||||||
start_idx + i + 1,
|
start_idx + i + 1, dic);
|
||||||
dic, i ? &dic->ref : NULL);
|
|
||||||
dic->cpages[i] = page;
|
dic->cpages[i] = page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue