lkml.org 
[lkml]   [2019]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 13/22] staging: erofs: refine erofs_allocpage()
    Date
    remove duplicated code in decompressor by introducing
    failable erofs_allocpage().

    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
    ---
    drivers/staging/erofs/decompressor.c | 12 +++---------
    drivers/staging/erofs/internal.h | 2 +-
    drivers/staging/erofs/utils.c | 5 +++--
    drivers/staging/erofs/zdata.c | 5 +----
    4 files changed, 8 insertions(+), 16 deletions(-)

    diff --git a/drivers/staging/erofs/decompressor.c b/drivers/staging/erofs/decompressor.c
    index ee5762351f80..744c43a456e9 100644
    --- a/drivers/staging/erofs/decompressor.c
    +++ b/drivers/staging/erofs/decompressor.c
    @@ -74,15 +74,9 @@ static int lz4_prepare_destpages(struct z_erofs_decompress_req *rq,
    victim = availables[--top];
    get_page(victim);
    } else {
    - if (!list_empty(pagepool)) {
    - victim = lru_to_page(pagepool);
    - list_del(&victim->lru);
    - DBG_BUGON(page_ref_count(victim) != 1);
    - } else {
    - victim = alloc_pages(GFP_KERNEL, 0);
    - if (!victim)
    - return -ENOMEM;
    - }
    + victim = erofs_allocpage(pagepool, GFP_KERNEL, false);
    + if (unlikely(!victim))
    + return -ENOMEM;
    victim->mapping = Z_EROFS_MAPPING_STAGING;
    }
    rq->out[i] = victim;
    diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
    index 5e1ef2b5a458..a631acd0dc62 100644
    --- a/drivers/staging/erofs/internal.h
    +++ b/drivers/staging/erofs/internal.h
    @@ -516,7 +516,7 @@ int erofs_namei(struct inode *dir, struct qstr *name,
    extern const struct file_operations erofs_dir_fops;

    /* utils.c / zdata.c */
    -struct page *erofs_allocpage(struct list_head *pool, gfp_t gfp);
    +struct page *erofs_allocpage(struct list_head *pool, gfp_t gfp, bool nofail);

    #if (EROFS_PCPUBUF_NR_PAGES > 0)
    void *erofs_get_pcpubuf(unsigned int pagenr);
    diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c
    index 0e86e44d60d0..260ea2970b4b 100644
    --- a/drivers/staging/erofs/utils.c
    +++ b/drivers/staging/erofs/utils.c
    @@ -9,15 +9,16 @@
    #include "internal.h"
    #include <linux/pagevec.h>

    -struct page *erofs_allocpage(struct list_head *pool, gfp_t gfp)
    +struct page *erofs_allocpage(struct list_head *pool, gfp_t gfp, bool nofail)
    {
    struct page *page;

    if (!list_empty(pool)) {
    page = lru_to_page(pool);
    + DBG_BUGON(page_ref_count(page) != 1);
    list_del(&page->lru);
    } else {
    - page = alloc_pages(gfp | __GFP_NOFAIL, 0);
    + page = alloc_pages(gfp | (nofail ? __GFP_NOFAIL : 0), 0);
    }
    return page;
    }
    diff --git a/drivers/staging/erofs/zdata.c b/drivers/staging/erofs/zdata.c
    index bc478eebf509..3078510e350d 100644
    --- a/drivers/staging/erofs/zdata.c
    +++ b/drivers/staging/erofs/zdata.c
    @@ -634,10 +634,7 @@ z_erofs_vle_work_iter_end(struct z_erofs_vle_work_builder *builder)
    static inline struct page *__stagingpage_alloc(struct list_head *pagepool,
    gfp_t gfp)
    {
    - struct page *page = erofs_allocpage(pagepool, gfp);
    -
    - if (unlikely(!page))
    - return NULL;
    + struct page *page = erofs_allocpage(pagepool, gfp, true);

    page->mapping = Z_EROFS_MAPPING_STAGING;
    return page;
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-07-31 18:00    [W:4.676 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site