Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753715AbbK0N0Z (ORCPT ); Fri, 27 Nov 2015 08:26:25 -0500 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33234 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752164AbbK0N0X (ORCPT ); Fri, 27 Nov 2015 08:26:23 -0500 From: Minfei Huang To: axboe@fb.com, m@bjorling.me, akinobu.mita@gmail.com, rusty@rustcorp.com.au, keith.busch@intel.com, mcgrof@suse.com, krinkin.m.u@gmail.com Cc: linux-kernel@vger.kernel.org, mhuang@redhat.com, Minfei Huang Subject: [PATCH 1/2] null_blk: Remove null block from list in error path Date: Fri, 27 Nov 2015 21:26:12 +0800 Message-Id: <1448630773-4119-1-git-send-email-mnfhuang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1165 Lines: 40 To make consistent of null block list, we should remove enqueued null block from the list before freeing it. Signed-off-by: Minfei Huang --- drivers/block/null_blk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index ec99568..729ecd7 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -738,7 +738,7 @@ static int null_add_dev(void) rv = nvm_register(nullb->q, nullb->disk_name, &null_lnvm_dev_ops); if (rv) - goto out_cleanup_blk_queue; + goto out_cleanup_blk_list; goto done; } @@ -765,6 +765,10 @@ done: out_cleanup_lightnvm: if (use_lightnvm) nvm_unregister(nullb->disk_name); +out_cleanup_blk_list: + mutex_lock(&lock); + list_del_init(&nullb->list); + mutex_unlock(&lock); out_cleanup_blk_queue: blk_cleanup_queue(nullb->q); out_cleanup_tags: -- 1.8.3.1 -- 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/