[f2fs-dev] [PATCH] f2fs: clean up {cic,dic}.ref handling

[Chao Yu]

{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 <yuch...@huawei.com>
---
 fs/f2fs/compress.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 9cc279ea3bfb..c0e7ba245c74 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -55,7 +55,7 @@ bool f2fs_is_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);
        set_page_private(page, (unsigned long)data);
@@ -63,8 +63,6 @@ static void f2fs_set_compressed_page(struct page *page,
        /* i_crypto_info and iv index */
        page->index = index;
        page->mapping = inode->i_mapping;
-       if (r)
-               refcount_inc(r);
 }
 
 static void f2fs_put_compressed_page(struct page *page)
@@ -662,7 +660,7 @@ void f2fs_decompress_pages(struct bio *bio, struct page 
*page, bool verity)
                cops->destroy_decompress_ctx(dic);
 out_free_dic:
        if (verity)
-               refcount_add(dic->nr_cpages - 1, &dic->ref);
+               refcount_set(&dic->ref, dic->nr_cpages);
        if (!verity)
                f2fs_decompress_end_io(dic->rpages, dic->cluster_size,
                                                                ret, false);
@@ -1067,7 +1065,7 @@ static int f2fs_write_compressed_pages(struct 
compress_ctx *cc,
 
        cic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
        cic->inode = inode;
-       refcount_set(&cic->ref, 1);
+       refcount_set(&cic->ref, cc->nr_cpages);
        cic->rpages = f2fs_kzalloc(sbi, sizeof(struct page *) <<
                        cc->log_cluster_size, GFP_NOFS);
        if (!cic->rpages)
@@ -1077,8 +1075,7 @@ static int f2fs_write_compressed_pages(struct 
compress_ctx *cc,
 
        for (i = 0; i < cc->nr_cpages; i++) {
                f2fs_set_compressed_page(cc->cpages[i], inode,
-                                       cc->rpages[i + 1]->index,
-                                       cic, i ? &cic->ref : NULL);
+                                       cc->rpages[i + 1]->index, cic);
                fio.compressed_page = cc->cpages[i];
                if (fio.encrypted) {
                        fio.page = cc->rpages[i + 1];
@@ -1328,7 +1325,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct 
compress_ctx *cc)
 
        dic->magic = F2FS_COMPRESSED_PAGE_MAGIC;
        dic->inode = cc->inode;
-       refcount_set(&dic->ref, 1);
+       refcount_set(&dic->ref, cc->nr_cpages);
        dic->cluster_idx = cc->cluster_idx;
        dic->cluster_size = cc->cluster_size;
        dic->log_cluster_size = cc->log_cluster_size;
@@ -1352,8 +1349,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct 
compress_ctx *cc)
                        goto out_free;
 
                f2fs_set_compressed_page(page, cc->inode,
-                                       start_idx + i + 1,
-                                       dic, i ? &dic->ref : NULL);
+                                       start_idx + i + 1, dic);
                dic->cpages[i] = page;
        }
 
-- 
2.18.0.rc1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel