Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4341855pxb; Mon, 27 Sep 2021 15:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtj4xzyLJ1QAleCJ05YYbP+6OmL44QLQfLTenibfXVuvRLEJOplC7pHjwBPhR0GXOpKFWL X-Received: by 2002:a17:902:7484:b0:13d:ee75:8f3c with SMTP id h4-20020a170902748400b0013dee758f3cmr1863839pll.13.1632780118130; Mon, 27 Sep 2021 15:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780118; cv=none; d=google.com; s=arc-20160816; b=c3lb7UKqZ3ws0kaMHuH9pEYyKI4nXbWP2udDktBN5B2t8wzzZVeywgkSXgjF1C4ZHY L8T07zoYg8y42ot27YTWRHkoxlEW7kKbYHkJ64qiqAO7dkmMEynAZAx3DXS6bB82zA9C wZqYpOj8UZp+StxTHGz+VF6mvIDsFMKJLoz+Mb0DOsx1A6L3bDW10yL051BUqvaD1/qC 7okSyi0cvkeZHNNZfG7PV+f3N0aVhznREDsO+qtgaavvT9l4fyz+njy38EWTJSoCbpY2 WqmYk86ordXYhaCeqsU5ufYYVyXCmHDXsa4u6+ugoKTADpWCaMvYmv7lfuIAfBBwOp6G 3vRQ== 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=Dn0nwO97tF5sgMNA9UASzPzbBLRiiVkhBQPIhqix1v4=; b=M1T2kdDw5jZJz5lpQwxpHBAyycu4fjAVsGwAcgEjKAkcZL1v3p65GrxAkMsSyICzHF moqlK3f6tWlLwBInxfs9lWCzDODMBdfaVePq+4ZI9V4q6zzRCYijY5ZQmWlxrAEAkNmk wNHQGfDX5Cd7yhXgaL9Iedw53zHq3WuoZvR4VmlBYDrhXyeAYWY04GGoo7yUi3I6oiu/ DYjK7Iq17qcCVIMyBoSsMgTpcQ6v8DslidNWnM4lkgsYN6GxP0hueBu0SZD6aCzjJi9k mYNHjuEpnIUqjhxXAsG4XjTKWpwwQMq+n/N2r52O5yvvcCDeOXDkvVO1D/1PjRM11pcX IIxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=M3AH6Wnz; 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 f7si21494584pgp.224.2021.09.27.15.01.46; Mon, 27 Sep 2021 15:01:58 -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=M3AH6Wnz; 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 S237674AbhI0WCS (ORCPT + 99 others); Mon, 27 Sep 2021 18:02:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237364AbhI0WCI (ORCPT ); Mon, 27 Sep 2021 18:02:08 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5253C061769; 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=Dn0nwO97tF5sgMNA9UASzPzbBLRiiVkhBQPIhqix1v4=; b=M3AH6Wnz5zIiS4kLah8jwnFJa1 ltMKTFrQbN9BwJYv5ZCv995arAvOdhSKf8EhWlYPhIV7Sr4AAwpOdJUyB/F7ufNhgmWKlJA6kT51u oEr8JdB9+9L2GBUGN066ftfZvxsFamjpWTEunnhVUUlrH0gNd7c9KTDB5OwTMlb2O/mt+cQjgJpxf EADkOpygKHi6dbUm5sFFGcyQ4TNHklG/jXADY24VCBj8UGxfRD6IUN/ewsC4aZXuMafNSgQZs1d2N kmO4Jj/Pkj7TUy+slVYTrDQ5GgBAgTRhJEN1V6r0g+5HcdKvRMN4F6JlNsbifP6Tro38G+UrmTvbP 1KQBjKAw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyfN-004SV5-96; 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 6/6] nbd: add error handling support for add_disk() Date: Mon, 27 Sep 2021 14:59:58 -0700 Message-Id: <20210927215958.1062466-7-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/nbd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 5170a630778d..741365295157 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1757,7 +1757,9 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) disk->fops = &nbd_fops; disk->private_data = nbd; sprintf(disk->disk_name, "nbd%d", index); - add_disk(disk); + err = add_disk(disk); + if (err) + goto out_err_disk; /* * Now publish the device. @@ -1766,6 +1768,8 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) nbd_total_devices++; return nbd; +out_err_disk: + blk_cleanup_disk(disk); out_free_idr: mutex_lock(&nbd_index_mutex); idr_remove(&nbd_index_idr, index); -- 2.30.2