lkml.org 
[lkml]   [2016]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/28] lightnvm: refactor set_bb_tbl for accepting ppa list
    Date
    The set_bb_tbl takes struct nvm_rq and only uses its ppa_list and
    nr_pages internally. Instead, make these two variables explicit.
    This allows a user to call it without initializing a struct nvm_rq
    first.

    Signed-off-by: Matias Bjørling <m@bjorling.me>
    ---
    drivers/lightnvm/sysblk.c | 2 +-
    drivers/nvme/host/lightnvm.c | 8 ++++----
    include/linux/lightnvm.h | 2 +-
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c
    index 737fbc3..b98ca19 100644
    --- a/drivers/lightnvm/sysblk.c
    +++ b/drivers/lightnvm/sysblk.c
    @@ -280,7 +280,7 @@ static int nvm_set_bb_tbl(struct nvm_dev *dev, struct sysblk_scan *s, int type)
    nvm_set_rqd_ppalist(dev, &rqd, s->ppas, s->nr_ppas, 1);
    nvm_generic_to_addr_mode(dev, &rqd);

    - ret = dev->ops->set_bb_tbl(dev, &rqd, type);
    + ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_pages, type);
    nvm_free_rqd_ppalist(dev, &rqd);
    if (ret) {
    pr_err("nvm: sysblk failed bb mark\n");
    diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
    index 45e3511..d426d95 100644
    --- a/drivers/nvme/host/lightnvm.c
    +++ b/drivers/nvme/host/lightnvm.c
    @@ -441,8 +441,8 @@ out:
    return ret;
    }

    -static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd,
    - int type)
    +static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr *ppas,
    + int nr_ppas, int type)
    {
    struct nvme_ns *ns = nvmdev->q->queuedata;
    struct nvme_nvm_command c = {};
    @@ -450,8 +450,8 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd,

    c.set_bb.opcode = nvme_nvm_admin_set_bb_tbl;
    c.set_bb.nsid = cpu_to_le32(ns->ns_id);
    - c.set_bb.spba = cpu_to_le64(rqd->ppa_addr.ppa);
    - c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1);
    + c.set_bb.spba = cpu_to_le64(ppas->ppa);
    + c.set_bb.nlb = cpu_to_le16(nr_ppas - 1);
    c.set_bb.value = type;

    ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,
    diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
    index 9ae0b7c..af72ca7 100644
    --- a/include/linux/lightnvm.h
    +++ b/include/linux/lightnvm.h
    @@ -45,7 +45,7 @@ typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *);
    typedef int (nvm_get_l2p_tbl_fn)(struct nvm_dev *, u64, u32,
    nvm_l2p_update_fn *, void *);
    typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, u8 *);
    -typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct nvm_rq *, int);
    +typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct ppa_addr *, int, int);
    typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *);
    typedef int (nvm_erase_blk_fn)(struct nvm_dev *, struct nvm_rq *);
    typedef void *(nvm_create_dma_pool_fn)(struct nvm_dev *, char *);
    --
    2.1.4
    \
     
     \ /
      Last update: 2016-05-06 20:21    [W:3.482 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site