Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp987908pxb; Wed, 3 Nov 2021 16:09:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw50TYOaPig3kC3LgaMCNrbZU5Ygkcw+AippV48INC0Q0V6aYk3HJCqFq62O6WK0xzlZR+p X-Received: by 2002:aa7:db93:: with SMTP id u19mr64262822edt.179.1635980956330; Wed, 03 Nov 2021 16:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635980956; cv=none; d=google.com; s=arc-20160816; b=06gCX4Juu62s3N0lv4sAwdL2R4c736/jjmSuFIW77AMw7kUMhCd2CATDlHVrH6BIHH BOZBd+rLdErgFh84clSZX1aXBk8RI+4zL6oD++lR8tchRvDXRN7ujEbLpStZqJZj+gjK Xb2iQUIZC4AJN4Bo1jV4J4ePiCrK4SHItgpFbgAZ4g1Tesv8Aa2UJofmkg7wTUqviBMG 3/saHuja/65OkCt+jdJJWm8YMQqr7XMekF1JGfg11uuyEN3SXm16iH/eJlCqtli7algK 8+esvvHnv+IAtNov8hQh7sbqCHPnTeRMnEJ4bHvR4+vr+G3zsB0QAicIFokb5eINT+cI RsiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=C5e6xzRn1we/2kQlnWV6XI4+n17BdzCMXkcscKinpyQ=; b=qFlpw6bVBPm79M8w+MgJW4R5GiuFh1+k+pCclmlUHC7rm9YoU+uHPGPQjGW3dFdh+j t7b+QcM9AHBYYGpqX0sBOWdTcUtGxoCj67ScZgH0PnsFVqqY8+/H32+atZiERCiZlRhz HlHQKuDPqpwWo3/x6ZKITA3gt8FFCD5QoPnoxbWWAz+Cpqmlg5XWKvqM1Mi0XbWQJB84 AvVvzq3yFrwhO6LrCKcpAr8ZIttyMJiKjTPRYpU4UMo1qhbLH46WLII+OUokht5JBQPi X8bdEOoCzsQLAu1noWUZOmiCkvrdD4YhmjwZO8JtUEGUwWHb0laHNIjD4t8i3xl33ESP DjHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=rQgtdwDL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nd27si7892262ejc.554.2021.11.03.16.08.52; Wed, 03 Nov 2021 16:09:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=rQgtdwDL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbhKCXH5 (ORCPT + 99 others); Wed, 3 Nov 2021 19:07:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230397AbhKCXHb (ORCPT ); Wed, 3 Nov 2021 19:07:31 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB853C061205; Wed, 3 Nov 2021 16:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=C5e6xzRn1we/2kQlnWV6XI4+n17BdzCMXkcscKinpyQ=; b=rQgtdwDL4cqNfijcjNAVigkJo4 cX41IEACk3LN5nzW3JDiDwX8es6sV7SJBWWrikL7wJZ10emJnbjr7mU1XRFvR8VMtTJM4AyMZ8jVD ok4DrTxNa/oasSfaFJFfkKbUtOi7je6lbRFigSrXDEWcAom7taLmsuUboNUAgZLbYgtrHyvXx3B/h /ZBVeIz+FgoSveARRuQ4SabpuYt7ALHIlq830GTFAf5XV2o+XE7onZyyzu+BQ4SV9yphrf9qfQpGc WzodY35tkNJnxgS7e1h4Gpj39ooMZLknfbE8sCzs9dbuSDpQN0hQj72PcpFstr83Cjzzq+BXNlNdD hYgqe1Xw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPJ8-006seL-H5; Wed, 03 Nov 2021 23:04:38 +0000 From: Luis Chamberlain To: axboe@kernel.dk, hch@lst.de, penguin-kernel@i-love.sakura.ne.jp, dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com, efremov@linux.com, song@kernel.org, martin.petersen@oracle.com, hare@suse.de, jack@suse.cz, ming.lei@redhat.com, tj@kernel.org, mcgrof@kernel.org Cc: linux-mtd@lists.infradead.org, linux-scsi@vger.kernel.org, linux-raid@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 02/14] nvdimm/btt: add error handling support for add_disk() Date: Wed, 3 Nov 2021 16:04:25 -0700 Message-Id: <20211103230437.1639990-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211103230437.1639990-1-mcgrof@kernel.org> References: <20211103230437.1639990-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Reviewed-by: Christoph Hellwig Signed-off-by: Luis Chamberlain --- drivers/nvdimm/btt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 5cb6d7ac6e36..38ed53eeea5e 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1541,7 +1541,9 @@ static int btt_blk_init(struct btt *btt) } set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9); - device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL); + rc = device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL); + if (rc) + goto out_cleanup_disk; btt->nd_btt->size = btt->nlba * (u64)btt->sector_size; nvdimm_check_and_set_ro(btt->btt_disk); -- 2.33.0