Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752975AbbLDMWo (ORCPT ); Fri, 4 Dec 2015 07:22:44 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35290 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752680AbbLDMWB (ORCPT ); Fri, 4 Dec 2015 07:22:01 -0500 Subject: Re: [PATCH] lightnvm: put blks when luns configure failed To: Wenwei Tao References: <1449149248-3336-1-git-send-email-ww.tao0320@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org From: =?UTF-8?Q?Matias_Bj=c3=b8rling?= Message-ID: <56618566.30809@lightnvm.io> Date: Fri, 4 Dec 2015 13:21:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1449149248-3336-1-git-send-email-ww.tao0320@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1818 Lines: 67 On 12/03/2015 02:27 PM, Wenwei Tao wrote: > put the allocated blks back to the free list > when the luns configure failed, to make these > blks useable to others. > > Signed-off-by: Wenwei Tao > --- > drivers/lightnvm/rrpc.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c > index 75e59c3..1bb2f97 100644 > --- a/drivers/lightnvm/rrpc.c > +++ b/drivers/lightnvm/rrpc.c > @@ -202,6 +202,20 @@ static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk) > 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) > { > int next = atomic_inc_return(&rrpc->next_lun); > @@ -1224,18 +1238,21 @@ static int rrpc_luns_configure(struct rrpc *rrpc) > > rblk = rrpc_get_blk(rrpc, rlun, 0); > if (!rblk) > - return -EINVAL; > + goto err; > > rrpc_set_lun_cur(rlun, rblk); > > /* Emergency gc block */ > rblk = rrpc_get_blk(rrpc, rlun, 1); > if (!rblk) > - return -EINVAL; > + goto err; > rlun->gc_cur = rblk; > } > > return 0; > +err: > + rrpc_put_blks(rrpc); > + return -EINVAL; > } > > static struct nvm_tgt_type tt_rrpc; > Thanks Tao, applied. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/