From patchwork Fri Apr 7 18:31:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9670185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D8295602A0 for ; Fri, 7 Apr 2017 18:31:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFE5C25D9E for ; Fri, 7 Apr 2017 18:31:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C45E228613; Fri, 7 Apr 2017 18:31:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7149025D9E for ; Fri, 7 Apr 2017 18:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755843AbdDGSbY (ORCPT ); Fri, 7 Apr 2017 14:31:24 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35532 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755407AbdDGSbX (ORCPT ); Fri, 7 Apr 2017 14:31:23 -0400 Received: by mail-wm0-f41.google.com with SMTP id w64so4865212wma.0 for ; Fri, 07 Apr 2017 11:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DJH+AZL/Yji7sFk2BjpUAmyqvxQuquShV5qb6fK9W0A=; b=aANFyXhX70Vzu9z/cAfvMvI3MCb4B2Xzr6DM4JM3GiNWbAo/cuTN5o5ExNHvEuhLi8 6Ccq273+1hXzitGukjVyuD42Zf3Jb3iiYIkWq2k8KtKAo8sYuqQSsSbZTk78azJ4IZjo fZagJu0PA7+a5PAFL724eiXLeNAqBTK6XLriIv5ySwfEw8qI/myKy4HnjYgUHDeUJ2LJ Ubp3buCbB9dfmRnq09HKCcnKHKe6s8gJaQvQnRpk6DqVOSqv77c/c8xsZ479i4oXhied rjF8+fUoL+DjJ1tNQNkupBuD4irEusd6rBzSWwsng3mz9CwRtwRESjIDhR7/ww08wCpk 7+sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DJH+AZL/Yji7sFk2BjpUAmyqvxQuquShV5qb6fK9W0A=; b=BJ/hOnx8jbzjcpvKexj1NDlldSOJgqPCpjFrSy7kf0J3P9GdMY8Y9N2s5iesqit1Ss B5wt7bT8KKfWWRGjgIRJ2fqPh/VaFmQ5+EpuvWc8aFvp1ACJYt3hAqLFDORGqVNzkjJk zclCN/YYFS9eD5WQZcDJomqvsQcHFU7+Fl+L5QldI+QXZ/7jkZm1VQubrePa7bpwdqAT PB+I/HALSRjAN4sQDRiTNXCPG2ICAoUSeBiOFpyAsBGkwqnXmv32TFiguhNxoD33L0Ag G861KT4Yd3sMNPV+4WymuHrfvm9ysoPqnCIWro9/vPQQ2Peq3Jzv1dDR2ld31RdWOvE2 cd4w== X-Gm-Message-State: AN3rC/7luxIIpIDmL7Lj1hW+/C+fsuWXKc95+qF0UPUdf4u+523KgAP9Xy/7DU8+SZryFg== X-Received: by 10.28.209.202 with SMTP id i193mr597122wmg.17.1491589881950; Fri, 07 Apr 2017 11:31:21 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id w76sm5210910wrb.49.2017.04.07.11.31.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 11:31:21 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 2/4] lightnvm: fix cleanup order of disk on init error Date: Fri, 7 Apr 2017 20:31:12 +0200 Message-Id: <1491589874-26818-2-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491589874-26818-1-git-send-email-javier@cnexlabs.com> References: <1491589874-26818-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reorder disk allocation such that the disk structure can be put safely. Signed-off-by: Javier González --- drivers/lightnvm/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index da4c082..28e69a7 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -263,15 +263,15 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) goto err_t; } + tdisk = alloc_disk(0); + if (!tdisk) + goto err_dev; + tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node); if (!tqueue) - goto err_dev; + goto err_disk; blk_queue_make_request(tqueue, tt->make_rq); - tdisk = alloc_disk(0); - if (!tdisk) - goto err_queue; - sprintf(tdisk->disk_name, "%s", create->tgtname); tdisk->flags = GENHD_FL_EXT_DEVT; tdisk->major = 0; @@ -307,9 +307,9 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) if (tt->exit) tt->exit(targetdata); err_init: - put_disk(tdisk); -err_queue: blk_cleanup_queue(tqueue); +err_disk: + put_disk(tdisk); err_dev: nvm_remove_tgt_dev(tgt_dev, 0); err_t: