Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp711632pxb; Thu, 2 Sep 2021 13:15:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3eoBXF5mjE20aU/eRs5gGdFMVvTXRANfexG3WD8szRF1LptVEdp3DSRJgMWXLIHRaDIV5 X-Received: by 2002:a5d:9ad0:: with SMTP id x16mr118079ion.182.1630613736143; Thu, 02 Sep 2021 13:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630613736; cv=none; d=google.com; s=arc-20160816; b=oXtbH9LeWP1fE50ybuy7wgI3rpgMJsh4x9Yxvln2AHcG2A6PvjhJdPlegkAcaEdE7x 49ENqsu3Y+fiqBoYWJsqvL/3QJGGvlNYiLconRp2dusXG+6BjN9f5QgKGFVy1wRovRGI YrmAeVLGALsylAuHXJ35/6Ey8c+SqQJigW5dkxpKZxj+yma0z8b31AN6IFRp+Ij2jk6F O2PtoqtRvOAicuY4mf7ct/ecVJCAVk/op3oXsavLLxD5X+VFUcWk05xa/EojyJNsHCKV HNfmZ7gMZIqJQeN01WsW7BcQTaT7BkGQp2Qz+7B/q7kqMS5c06c+0L3fnRDpyXcSe6KI vD1w== 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=oUFeaFydBf47btSaJQAujL5lgV684wb9PUaVfH8cFxU=; b=SGVYWrkGb9FKjkV474T1eCC641kEki6oCAl3Ifg7NTSz0ftj7v2cmYX7tTPQwKAItt 3GsK2kznRMGifXWyNvhMHaEiZnWAZ9bfivjYmWhQ5hDtRowKNNrYMLwxMQKD7bxpQ66E Kdb66UdiIUVmGk8P/G1/jh8WHtz0/i14kCgVvXJ9h+fe8wnAOqkJwQ7eIj6NlrXMb9gx YMiGvd75nxokhRdb+c8p+8uYVBs8alJVqWAPkELXRC5lauoQM32v2JHrHbFhv0Bm25G5 yh+hqE7rm1/ggxaSxvSzpm8+tnRXmno9oDz/kMX10bdOo03OynMHBHmDPaAXoBsQhFFE CvQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=MDWGq2zI; 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 ay23si3281029iob.33.2021.09.02.13.15.22; Thu, 02 Sep 2021 13:15:36 -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=MDWGq2zI; 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 S1347132AbhIBRnL (ORCPT + 99 others); Thu, 2 Sep 2021 13:43:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347008AbhIBRmT (ORCPT ); Thu, 2 Sep 2021 13:42:19 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7AB9C061764; Thu, 2 Sep 2021 10:41:20 -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=oUFeaFydBf47btSaJQAujL5lgV684wb9PUaVfH8cFxU=; b=MDWGq2zI27NWhBv6BOn+YbZMyL rlV8p3XSRbJQOyaTy3gbg4Ql3AbI0pGITgKsByMSrltabrkFIGcrHpCGgHd2lSXPdGfxIeMeBz+O4 Sb8Q+dnOO6YWlGaUrgrcYsasm6r2qHgc2z5gVzswCiEy/WETkOcOfkZQP2JMT9Ad7OicfSIQf9IS9 og5e3xT2AJYwDoFEGE2CHHVSpRoEeBi/GLvSLjN5F8PJVFafzRYEeUD17hPqQBjL+XsUG5BHbpiAJ 89D/oQc66ppD4xFwjktNhGnQAqOOsxws43qx4n9vsTfid2FN8PY1KB224oc3DNq5JOU1Q+2XOuwOq iG1OAFVw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLqi2-00A9FI-0b; Thu, 02 Sep 2021 17:41:06 +0000 From: Luis Chamberlain To: axboe@kernel.dk, gregkh@linuxfoundation.org, chaitanya.kulkarni@wdc.com, atulgopinathan@gmail.com, hare@suse.de, maximlevitsky@gmail.com, oakad@yahoo.com, ulf.hansson@linaro.org, colin.king@canonical.com, shubhankarvk@gmail.com, baijiaju1990@gmail.com, trix@redhat.com, dongsheng.yang@easystack.cn, ceph-devel@vger.kernel.org, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sth@linux.ibm.com, hoeppner@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, borntraeger@de.ibm.com, oberpar@linux.ibm.com, tj@kernel.org Cc: linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org, linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH 4/9] rbd: add add_disk() error handling Date: Thu, 2 Sep 2021 10:41:00 -0700 Message-Id: <20210902174105.2418771-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210902174105.2418771-1-mcgrof@kernel.org> References: <20210902174105.2418771-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/rbd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e65c9d706f6f..341e5da6d029 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -7054,7 +7054,9 @@ static ssize_t do_rbd_add(struct bus_type *bus, if (rc) goto err_out_image_lock; - device_add_disk(&rbd_dev->dev, rbd_dev->disk, NULL); + rc = device_add_disk(&rbd_dev->dev, rbd_dev->disk, NULL); + if (rc) + goto err_out_cleanup_disk; spin_lock(&rbd_dev_list_lock); list_add_tail(&rbd_dev->node, &rbd_dev_list); @@ -7068,6 +7070,8 @@ static ssize_t do_rbd_add(struct bus_type *bus, module_put(THIS_MODULE); return rc; +err_out_cleanup_disk: + rbd_free_disk(rbd_dev); err_out_image_lock: rbd_dev_image_unlock(rbd_dev); rbd_dev_device_release(rbd_dev); -- 2.30.2