Commit d3d1a438 authored by Wenwei Tao's avatar Wenwei Tao Committed by Jens Axboe

lightnvm: put blks when luns configure failed

Put the allocated blocks back to the free list
when the luns configure failed, to make these
blocks useable to others.
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 f27a6299
...@@ -202,6 +202,20 @@ static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk) ...@@ -202,6 +202,20 @@ static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk)
nvm_put_blk(rrpc->dev, rblk->parent); nvm_put_blk(rrpc->dev, rblk->parent);
} }
static void rrpc_put_blks(struct rrpc *rrpc)
{
struct rrpc_lun *rlun;
int i;
for (i = 0; i < rrpc->nr_luns; i++) {
rlun = &rrpc->luns[i];
if (rlun->cur)
rrpc_put_blk(rrpc, rlun->cur);
if (rlun->gc_cur)
rrpc_put_blk(rrpc, rlun->gc_cur);
}
}
static struct rrpc_lun *get_next_lun(struct rrpc *rrpc) static struct rrpc_lun *get_next_lun(struct rrpc *rrpc)
{ {
int next = atomic_inc_return(&rrpc->next_lun); int next = atomic_inc_return(&rrpc->next_lun);
...@@ -1224,18 +1238,21 @@ static int rrpc_luns_configure(struct rrpc *rrpc) ...@@ -1224,18 +1238,21 @@ static int rrpc_luns_configure(struct rrpc *rrpc)
rblk = rrpc_get_blk(rrpc, rlun, 0); rblk = rrpc_get_blk(rrpc, rlun, 0);
if (!rblk) if (!rblk)
return -EINVAL; goto err;
rrpc_set_lun_cur(rlun, rblk); rrpc_set_lun_cur(rlun, rblk);
/* Emergency gc block */ /* Emergency gc block */
rblk = rrpc_get_blk(rrpc, rlun, 1); rblk = rrpc_get_blk(rrpc, rlun, 1);
if (!rblk) if (!rblk)
return -EINVAL; goto err;
rlun->gc_cur = rblk; rlun->gc_cur = rblk;
} }
return 0; return 0;
err:
rrpc_put_blks(rrpc);
return -EINVAL;
} }
static struct nvm_tgt_type tt_rrpc; static struct nvm_tgt_type tt_rrpc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment