From patchwork Thu Nov 19 11:50:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 7656591 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E513DBF90C for ; Thu, 19 Nov 2015 11:50:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 248B2200EC for ; Thu, 19 Nov 2015 11:50:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4741A206A2 for ; Thu, 19 Nov 2015 11:50:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758229AbbKSLun (ORCPT ); Thu, 19 Nov 2015 06:50:43 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37142 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757544AbbKSLuT (ORCPT ); Thu, 19 Nov 2015 06:50:19 -0500 Received: by wmww144 with SMTP id w144so112895480wmw.0 for ; Thu, 19 Nov 2015 03:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=bdxHzjr0MelpIJE8haRbPXbe1KSPqTFqVmo4EQl5m2g=; b=CBvgKBtH/H4h9FiidAuI+IMjBA2TsAqnawet1ThXc3JSnD1fHjiGDbTEZ0SJOdPAiT T0NbavKX8MFn9Lm02F7SYNeZ0D3nJgBd0D2BpWfEgUFLTDAzCrnprJVRj/qe1H4HA0dW zfGuN+1bdoYWSnPXSvyviW5PedPy+gnyGKCds= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=bdxHzjr0MelpIJE8haRbPXbe1KSPqTFqVmo4EQl5m2g=; b=ZJxMlEsulapXUcq3KQygnqCxjxpwpoLRuL8H1z8DsZFGckYZOXL7ocODhCM8K8gbk8 m0u1WUboCM1Nqmblx0SUbaeiVMUGOSuJ90UAUgMs1Av4kUylUJpB1LtCJR3XeFvjbg8+ 1xKz5P7fmYQbh8zKvbq4OFptYui2xrXGOzFeEc7nSJXFlWGCGtEkr22eEhTN7zTSeJpP xOzQNJw2YIyQBJHew0OGKtgnfFJZhf5+d4Idi3VJceIBQePLBlt3aaLlZ13ji9PwI/of ytrR+sea8qKaDeowza6HklxUNmhzvQI38CUPu9jCSBmJTeqXf2DytuXmaDKN8j3y4E/P XrJA== X-Gm-Message-State: ALoCoQnpmWA0hwXhsahJmy74EmueIOchN0lKIJKso+M8fN89qEL694bEx0Tau6LMQDWWIDx9+fYm X-Received: by 10.28.137.194 with SMTP id l185mr9698280wmd.21.1447933817786; Thu, 19 Nov 2015 03:50:17 -0800 (PST) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id a186sm7950653wmh.4.2015.11.19.03.50.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 03:50:17 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 3/3] null_blk: do not del gendisk with lightnvm Date: Thu, 19 Nov 2015 12:50:10 +0100 Message-Id: <1447933810-10267-4-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447933810-10267-1-git-send-email-m@bjorling.me> References: <1447933810-10267-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The gendisk structure has not been initialized when using lightnvm. Make sure to not delete it upon exit. Also make sure that we use the appropriate disk_name at unregistration. Signed-off-by: Matias Bjørling --- drivers/block/null_blk.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 6184b82..fb70b54 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -435,12 +435,14 @@ static void null_del_dev(struct nullb *nullb) list_del_init(&nullb->list); if (use_lightnvm) - nvm_unregister(nullb->disk->disk_name); - del_gendisk(nullb->disk); + nvm_unregister(nullb->disk_name); + else + del_gendisk(nullb->disk); blk_cleanup_queue(nullb->q); if (queue_mode == NULL_Q_MQ) blk_mq_free_tag_set(&nullb->tag_set); - put_disk(nullb->disk); + if (!use_lightnvm) + put_disk(nullb->disk); cleanup_queues(nullb); kfree(nullb); }