lightnvm: don't check for failure from mempool_alloc()

[karo-tx-linux.git] / drivers / lightnvm / rrpc.c

diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index 9fb7de395915ca8e3893f16273a5e6c20d4a763d..a8acf9e06401b73442a45ff0e27e016ca64dcb89 100644 (file)
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -318,10 +318,6 @@ static int rrpc_move_valid_pages(struct rrpc *rrpc, struct rrpc_block *rblk)
        }
 
        page = mempool_alloc(rrpc->page_pool, GFP_NOIO);
-       if (!page) {
-               bio_put(bio);
-               return -ENOMEM;
-       }
 
        while ((slot = find_first_zero_bit(rblk->invalid_pages,
                                            nr_sec_per_blk)) < nr_sec_per_blk) {
@@ -414,7 +410,6 @@ static void rrpc_block_gc(struct work_struct *work)
        struct rrpc *rrpc = gcb->rrpc;
        struct rrpc_block *rblk = gcb->rblk;
        struct rrpc_lun *rlun = rblk->rlun;
-       struct nvm_tgt_dev *dev = rrpc->dev;
        struct ppa_addr ppa;
 
        mempool_free(gcb, rrpc->gcb_pool);
@@ -430,7 +425,7 @@ static void rrpc_block_gc(struct work_struct *work)
        ppa.g.lun = rlun->bppa.g.lun;
        ppa.g.blk = rblk->id;
 
-       if (nvm_erase_blk(dev, &ppa, 0))
+       if (nvm_erase_sync(rrpc->dev, &ppa, 1))
                goto put_back;
 
        rrpc_put_blk(rrpc, rblk);
@@ -779,7 +774,7 @@ static void rrpc_end_io_write(struct rrpc *rrpc, struct rrpc_rq *rrqd,
 
 static void rrpc_end_io(struct nvm_rq *rqd)
 {
-       struct rrpc *rrpc = container_of(rqd->ins, struct rrpc, instance);
+       struct rrpc *rrpc = rqd->private;
        struct nvm_tgt_dev *dev = rrpc->dev;
        struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);
        uint8_t npages = rqd->nr_ppas;
@@ -972,8 +967,9 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
 
        bio_get(bio);
        rqd->bio = bio;
-       rqd->ins = &rrpc->instance;
+       rqd->private = rrpc;
        rqd->nr_ppas = nr_pages;
+       rqd->end_io = rrpc_end_io;
        rrq->flags = flags;
 
        err = nvm_submit_io(dev, rqd);
@@ -1006,11 +1002,6 @@ static blk_qc_t rrpc_make_rq(struct request_queue *q, struct bio *bio)
        }
 
        rqd = mempool_alloc(rrpc->rq_pool, GFP_KERNEL);
-       if (!rqd) {
-               pr_err_ratelimited("rrpc: not able to queue bio.");
-               bio_io_error(bio);
-               return BLK_QC_T_NONE;
-       }
        memset(rqd, 0, sizeof(struct nvm_rq));
 
        err = rrpc_submit_io(rrpc, bio, rqd, NVM_IOTYPE_NONE);
@@ -1274,8 +1265,10 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun)
        }
 
        nr_blks = nvm_bb_tbl_fold(dev->parent, blks, nr_blks);
-       if (nr_blks < 0)
-               return nr_blks;
+       if (nr_blks < 0) {
+               ret = nr_blks;
+               goto out;
+       }
 
        for (i = 0; i < nr_blks; i++) {
                if (blks[i] == NVM_BLK_T_FREE)
@@ -1532,7 +1525,6 @@ static void *rrpc_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk)
        if (!rrpc)
                return ERR_PTR(-ENOMEM);
 
-       rrpc->instance.tt = &tt_rrpc;
        rrpc->dev = dev;
        rrpc->disk = tdisk;
 
@@ -1611,7 +1603,6 @@ static struct nvm_tgt_type tt_rrpc = {
 
        .make_rq        = rrpc_make_rq,
        .capacity       = rrpc_capacity,
-       .end_io         = rrpc_end_io,
 
        .init           = rrpc_init,
        .exit           = rrpc_exit,