Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4341670pxb; Mon, 27 Sep 2021 15:01:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzqVnTd6EU2b55IgKKz9GrkVFE6bJiDr1SB5ZaEzHkLEQev+LtA7NUGHe515biMcy2vwrH X-Received: by 2002:a63:fe41:: with SMTP id x1mr1589137pgj.272.1632780107743; Mon, 27 Sep 2021 15:01:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780107; cv=none; d=google.com; s=arc-20160816; b=tq3eXkGXmktvn47KPRIwCRvZfPWcbSUyekQ6cLxgxsJY2OT1hEnt6SDju8XEaPkoqC XAARz7lXgkg72e2+/etLCf6KNonQfj2Ln0tS+aqZiv18bzS+dM4Ow47t9FhPiPhFLlY1 sAc7MHD3LB62HCwOjdkYavb94vGlUUem5n9jSZrxhWKI4vv+H9BzPaPjpEXg6WnhtRSt UeYEye+PtcUJTbw3s4jikufDgbuJm4mT0f2eV4W1OWv0tAV/miYd8A6I1hP00/oZDmZm vc7SRQEuqI8tq7d5Q2O8mUCvjk09HV63RScZYEu3SXD0EgpacVs0fguWSXgciBN5uiW8 pOLA== 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=eOGl5IZyZNnFXmP+I7kKDBQKd7BBidBOUcZv+xPQqWI=; b=FePlwYRBEn9UXUTMcLgKWrKzVkpn5eyBC55XdKP8nFIovq6XdaAaJYhnlz3k8Hrz3n 4WPD4UHMyA207QW/NPHYazD68Q5hz4l1punB7qxnTnoSFtoshNRRRpZ91rr8MHaE77Hx RR6OBfEzgeHKt36yR/tFMqh6zx+22A0oR0u5kF327PJyzcqgpOv2ShCg5ru0Fv8itUv0 xBv1zSkGAc38a+s6/WEY/sKjTjwLMx9YvCml7hdKqj3JjNSVYbt7AueXlnTmXpv5/5eL mt9yIHMEYjFOjqt0Vs9hOY4oY6YsSXJObIghXAOW6pSNbNb496tfoqsybGMhePQQ0m4u OBJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=lliCu+eK; 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 s15si870146pje.155.2021.09.27.15.01.34; Mon, 27 Sep 2021 15:01:47 -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=lliCu+eK; 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 S237524AbhI0WCQ (ORCPT + 99 others); Mon, 27 Sep 2021 18:02:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237306AbhI0WCH (ORCPT ); Mon, 27 Sep 2021 18:02:07 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 928FAC061765; Mon, 27 Sep 2021 15:00:29 -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=eOGl5IZyZNnFXmP+I7kKDBQKd7BBidBOUcZv+xPQqWI=; b=lliCu+eKd3V1P+/sYJ0yd2PCrh 9ELPfdPTivFsxLYVUQdamOKpTZQ5EjeWqzTGXImkFZuCCORPUD+0L7y3MbC4152PxLGq8Q1x3nR/y WbH9zYoGLr25pTRIqdL8Iu252s6oS8y94K/V+SoZG/YWmCX6lWaIFAVta7RgjUzwN4eZpHHbAljny jv2QEBGFzrDs1l7laCe38Z7KLC4Fkl4R9S9hCiIPX6RUKp9M4N4rKNplc99ZW22MSmEaB6Zf+XayC yn1e0cU462V4kxPmlszoM+JuCqTn1LzCOZ63BKAAsE7Uby00tY6XZZ6oGKLaoejvN+6vYqRkn+h/6 FCYNbmoQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyfM-004SV3-Vt; Mon, 27 Sep 2021 22:00:05 +0000 From: Luis Chamberlain To: axboe@kernel.dk, martin.petersen@oracle.com, jejb@linux.ibm.com, kbusch@kernel.org, sagi@grimberg.me, adrian.hunter@intel.com, beanhuo@micron.com, ulf.hansson@linaro.org, avri.altman@wdc.com, swboyd@chromium.org, agk@redhat.com, snitzer@redhat.com, josef@toxicpanda.com Cc: hch@infradead.org, hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-mmc@vger.kernel.org, dm-devel@redhat.com, nbd@other.debian.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain , Christoph Hellwig Subject: [PATCH v4 5/6] loop: add error handling support for add_disk() Date: Mon, 27 Sep 2021 14:59:57 -0700 Message-Id: <20210927215958.1062466-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927215958.1062466-1-mcgrof@kernel.org> References: <20210927215958.1062466-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 Reviewed-by: Hannes Reinecke Signed-off-by: Luis Chamberlain --- drivers/block/loop.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 7bf4686af774..00ee365ed5e0 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -2394,13 +2394,19 @@ static int loop_add(int i) disk->event_flags = DISK_EVENT_FLAG_UEVENT; sprintf(disk->disk_name, "loop%d", i); /* Make this loop device reachable from pathname. */ - add_disk(disk); + err = add_disk(disk); + if (err) + goto out_cleanup_disk; + /* Show this loop device. */ mutex_lock(&loop_ctl_mutex); lo->idr_visible = true; mutex_unlock(&loop_ctl_mutex); + return i; +out_cleanup_disk: + blk_cleanup_disk(disk); out_cleanup_tags: blk_mq_free_tag_set(&lo->tag_set); out_free_idr: -- 2.30.2