Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b79beb4 authored by Wenwei Tao's avatar Wenwei Tao Committed by Jens Axboe
Browse files

lightnvm: move the pages per block check out of the loop 



There is no need to check whether dev's pages per block is
beyond rrpc support every time we init a lun, we only need
to check it once before enter the lun init loop.

Signed-off-by: default avatarWenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 556755e9

drivers/lightnvm/rrpc.c

+5 −6
Original line number Diff line number Diff line
@@ -1114,6 +1114,11 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) 
	struct rrpc_lun *rlun;

	int i, j;



	if (dev->pgs_per_blk > MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) {

		pr_err("rrpc: number of pages per block too high.");

		return -EINVAL;

	}



	spin_lock_init(&rrpc->rev_lock);



	rrpc->luns = kcalloc(rrpc->nr_luns, sizeof(struct rrpc_lun),
@@ -1125,12 +1130,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) 
	for (i = 0; i < rrpc->nr_luns; i++) {

		struct nvm_lun *lun = dev->mt->get_lun(dev, lun_begin + i);



		if (dev->pgs_per_blk >

				MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) {

			pr_err("rrpc: number of pages per block too high.");

			goto err;

		}



		rlun = &rrpc->luns[i];

		rlun->rrpc = rrpc;

		rlun->parent = lun;