Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4343804pxb; Mon, 27 Sep 2021 15:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiF+60yCJtB8tegUfjkBtmhB7cgue+Poa0DyizWso69OZDiTi9nleBhhAXrGlNNa9ZM4Xt X-Received: by 2002:a50:9dcf:: with SMTP id l15mr3058586edk.137.1632780284378; Mon, 27 Sep 2021 15:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780284; cv=none; d=google.com; s=arc-20160816; b=Okgk7+E3Xeyqtz1t8DoVWp6d+5pD6P7V2H0vWW0+qEn14nVOkcWOvSvunCGy2V1DdI AlxYOJqFL68bCf6laB4nOFbkOv5rgfT5yIMyhtkijqWwd2PpHbe035uzOBjkBW4JkQh/ Y7rCAWzrMFiOpx1/sQopG0kkFbb8pojjPQ6NR4zFyl3PN03/qTc9Nql/GUQLSlpddil4 BMnqI2saxyWRe1qgsSnspODDQRpVwq6WUwrOHslG1No27MFImx+ArVQ1EWypwJm+/AH2 OR2ZhHkZqG7fibwas4YYj9jN+/uWV6VAuuhYFEx2+1ODnozcqpAnhPyF75ML1fWPPh/b jW4w== 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=08q31EIVp0CLnjZ3JOSG2pLmduRMGbbY0RWG/PagZSQ=; b=gDdTvKGWLVn8LZ9nONnQ2F2E1wqC9qjqcKwdflodC3s397v4f+TwMaqThvooS9wVH7 ucW+MhbRzav8M5iJueymRrJATtFONR+XFfxYYA9zWc5JWxESjMLrjvHrOhe86EPRRPEO DhEebSiWkZOE5iZCJxJlwMXNni80obdcWHXYTCAbUbaQmptbcQ9sLJBp9WyhlaCA+2ke wX2a7EdeYc8Bz2T22f3L5GpnPKwAojCyKGpAjw7kllh0HUp9piL8gC8HyW0FYwjwvTiO BLvaDHOHLUmtxa1sd9KNUIDYnSaWDmUjgMDTezL+7ao5niNmNUjdKp/A+LoHPWsXACAH onPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=dTfOGMG3; 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 jy20si18454107ejc.27.2021.09.27.15.04.20; Mon, 27 Sep 2021 15:04:44 -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=dTfOGMG3; 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 S238166AbhI0WEe (ORCPT + 99 others); Mon, 27 Sep 2021 18:04:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237544AbhI0WDf (ORCPT ); Mon, 27 Sep 2021 18:03:35 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79010C06125D; Mon, 27 Sep 2021 15:01:35 -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=08q31EIVp0CLnjZ3JOSG2pLmduRMGbbY0RWG/PagZSQ=; b=dTfOGMG3AUYtr1bbCvG0t/klmk LajkDYnCSmLe5sT2mHlX5un+6JkZTlg6PVmWy4n5/jgMM/1A6QdINqzW+2KuF4kDyJ8nTkrt8z8n0 jjusumjxb+KSwZv+kU0wBQHA6Hkv2iykZTStpVHwwFltABaYnNs1hWEIhYff0sMAjxbUs350a55K3 JHrs2nbuUBT1jU9cWK+1XZTDN41Hf4nMBTqsRDCdL2otKu/9pw25SXrc2JgTutuxeRBmL442aIUba XEFhwVvAydc/G8adPf7VLVpBDx4OAGF3Weps0t52oIP5WeiDl/FWVvLlY7imcJkluXUwBIZTO7S1v WUzWDZGQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUygR-004TPI-N2; Mon, 27 Sep 2021 22:01:11 +0000 From: Luis Chamberlain To: axboe@kernel.dk, justin@coraid.com, geert@linux-m68k.org, ulf.hansson@linaro.org, hare@suse.de, tj@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes.berg@intel.com, chris.obbard@collabora.com, krisman@collabora.com, zhuyifei1999@gmail.com, thehajime@gmail.com, chris@zankel.net, jcmvbkbc@gmail.com, tim@cyberelk.net Cc: linux-xtensa@linux-xtensa.org, linux-um@lists.infradead.org, linux-m68k@lists.linux-m68k.org, drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 02/15] aoe: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:00:57 -0700 Message-Id: <20210927220110.1066271-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927220110.1066271-1-mcgrof@kernel.org> References: <20210927220110.1066271-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. Signed-off-by: Luis Chamberlain --- drivers/block/aoe/aoeblk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index 06b360f7123a..e436b0e8eff5 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c @@ -417,7 +417,9 @@ aoeblk_gdalloc(void *vp) spin_unlock_irqrestore(&d->lock, flags); - device_add_disk(NULL, gd, aoe_attr_groups); + err = device_add_disk(NULL, gd, aoe_attr_groups); + if (err) + goto out_disk_cleanup; aoedisk_add_debugfs(d); spin_lock_irqsave(&d->lock, flags); @@ -426,6 +428,8 @@ aoeblk_gdalloc(void *vp) spin_unlock_irqrestore(&d->lock, flags); return; +out_disk_cleanup: + blk_cleanup_disk(gd); err_tagset: blk_mq_free_tag_set(set); err_mempool: -- 2.30.2