From d3d581ecb6f10a59777001747f584735065c2d2e Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Mon, 17 May 2021 10:33:58 -0700 Subject: [PATCH] Simplify lbd a bit, as logical block shift cannot be zero --- dm-compress/lbd.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dm-compress/lbd.c b/dm-compress/lbd.c index de1a4d2..c907494 100644 --- a/dm-compress/lbd.c +++ b/dm-compress/lbd.c @@ -258,6 +258,7 @@ lbd_ctr(struct lbd* lbd, void* percpu) { u32 nr_pages = DIV_ROUND_UP(lblk_size(&kparams->params), PAGE_SIZE); + BUG_ON(nr_pages == 1); memset(lbd, 0, sizeof(struct lbd)); INIT_LIST_HEAD(&lbd->lru_list); @@ -279,14 +280,9 @@ lbd_ctr(struct lbd* lbd, if (!cbd_alloc_pagev(lbd->pagev, nr_pages)) { return false; } - if (nr_pages == 1) { - lbd->buf = page_address(lbd->pagev[0]); - } - else { - lbd->buf = vmap(lbd->pagev, nr_pages, VM_MAP, PAGE_KERNEL); - if (!lbd->buf) { - return false; - } + lbd->buf = vmap(lbd->pagev, nr_pages, VM_MAP, PAGE_KERNEL); + if (!lbd->buf) { + return false; } lbd->c_len = 0; @@ -311,9 +307,7 @@ lbd_dtr(struct lbd* lbd) printk(KERN_ERR "%s: lbatviewcache_put failed\n", __func__); } lbd->c_len = 0; - if (nr_pages != 1) { - vunmap(lbd->buf); - } + vunmap(lbd->buf); lbd->buf = NULL; if (lbd->pagev) { cbd_free_pagev(lbd->pagev, nr_pages);