diff options
| author | Wenwei Tao <ww.tao0320@gmail.com> | 2016-01-12 07:49:27 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-01-12 08:21:17 -0700 |
| commit | 4b79beb4c36d697e940e9f70d72399c71230a418 (patch) | |
| tree | dfb308f42e9bdb7c5572c4df3065034107de4ba1 /drivers/lightnvm | |
| parent | 556755e941837ebc4b4859dd7f74f2ed2dd00fc7 (diff) | |
| download | talos-op-linux-4b79beb4c36d697e940e9f70d72399c71230a418.tar.gz talos-op-linux-4b79beb4c36d697e940e9f70d72399c71230a418.zip | |
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: Wenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
| -rw-r--r-- | drivers/lightnvm/rrpc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index 745acd9db523..ec7aacf78f2f 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -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; |
