lightnvm: don't check for failure from mempool_alloc() (b0e0306c) · Commits · 戴 / test

mempool_alloc() cannot fail if the gfp flags allow it to sleep, and both GFP_KERNEL and GFP_NOIO allows for sleeping. So rrpc_move_valid_pages() and rrpc_make_rq() don't need to test the return value. Signed-off-by:

NeilBrown <neilb@suse.com> Signed-off-by:

Matias Bjørling <matias@cnexlabs.com> Signed-off-by:

Jens Axboe <axboe@fb.com>

drivers/lightnvm/rrpc.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -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) {
		@@ -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);

Admin message