Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4343486pxb; Mon, 27 Sep 2021 15:04:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXeyD0qbY/Qb8CbQFLP23hDpKDglFD2qwA6vK1r2Ncz1xh0fVI+xasUU2yqVUN6mE8sVRX X-Received: by 2002:a62:dd94:0:b0:442:bb03:9663 with SMTP id w142-20020a62dd94000000b00442bb039663mr1969788pff.0.1632780255908; Mon, 27 Sep 2021 15:04:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780255; cv=none; d=google.com; s=arc-20160816; b=bfAAZ/qNnSz+/iO0P67Ub85T9m98rjdDg6JneXO9LdcydVgippbH7vluzJo86soWI6 Tz8k6/ryraGBdJNv66s8/8+TM6ndPaSdoH8m7N6iHBrpm2eyxqh6BzAKpTytDn6l8NC2 DgRHTpoNWMrmQIY1SUm699N3ECoj5svyxryIJM3Rr+YEh/jbwD092dFSuFuvMRFwFfGL jKCRbFoQE6s8gQYHo3CH0gFImKpdthlwAuqDzRAboQCZ3OBvjlNsRFCCk1kJ4B0jJraN OVlU8ryYVYI/kr133E5VoOWwArnmemdeA9b4Rk1bcUig5w9KpSEDSLFI9WWHgB2mu6LG idlw== 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=vzfFGe77MiDtDAcsNEd4FFV6XUqpkLp7v2/+XiGswys=; b=eNC+4H7OBKb1qVe5ibv6S6f6M2K0Vt1NQ38zNjPtR4mZSxsdiZQDRE8sqhZ+RWyOcv n0MsDZWE5wU4BSLhCQD6MVRw5mJEm6aAt5PPcCKjcgzmk7hst/alKmibf1d5OEv4mFdk ZwGfrj3UJzZ0XjJ0zO/9bzMR/l1mBVo6tL8GE3fmf+691m8xeClItm5RsOPCHcwe7Pp1 6IMrdF1taUJISVF/ThwX0rq2AC0MbPIuQ0nNxmkHjT4ekmVj1KdcDz7IYcalk2z08vGL 5fV9r1whW8+juleBzcO0gJ/PEEaAI/XFH033DrJIIoMbN3jhkSYfKhDHFvBFgIPeV7Kq QB4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=1IjRffMW; 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.04.03; Mon, 27 Sep 2021 15:04:15 -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=1IjRffMW; 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 S237695AbhI0WDM (ORCPT + 99 others); Mon, 27 Sep 2021 18:03:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237763AbhI0WCg (ORCPT ); Mon, 27 Sep 2021 18:02:36 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74CE5C061774; Mon, 27 Sep 2021 15:00:55 -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=vzfFGe77MiDtDAcsNEd4FFV6XUqpkLp7v2/+XiGswys=; b=1IjRffMWToIuI5hlT0QDQQle10 h2cmW94BFoi6hungxxRyemGHngj6jAyo6qgzCDtNwyoUIWdx8yZsIACgBw+d6Nd4692A4UqE77TGE FCZRmyjQTpFaOofQoJtOcS2Pkb2YvtxiwdI6lkhFHGjLfTo7fvE2zEi7m6m4dPHjKrCOvij4KUPWH DSYAexzPrZhtGZMXRAVrRoXp4+plHqrbeuTjWRI7g5ndnkdAFIDfDHEv6r0wdbAfWet/1/8nTrT68 8nOiI5xCjxlwlC2oda7p9NvctMKAA8h8pcRZ7GYw/ktOiSjdKEDnnDoQuyC514ICPIyH9sAgE7omc UHhUFlIg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyfw-004Sua-BV; Mon, 27 Sep 2021 22:00:40 +0000 From: Luis Chamberlain To: axboe@kernel.dk, colyli@suse.de, kent.overstreet@gmail.com, kbusch@kernel.org, sagi@grimberg.me, vishal.l.verma@intel.com, dan.j.williams@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, konrad.wilk@oracle.com, roger.pau@citrix.com, boris.ostrovsky@oracle.com, jgross@suse.com, sstabellini@kernel.org, minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org Cc: xen-devel@lists.xenproject.org, nvdimm@lists.linux.dev, linux-nvme@lists.infradead.org, linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 01/10] block/brd: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:00:30 -0700 Message-Id: <20210927220039.1064193-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927220039.1064193-1-mcgrof@kernel.org> References: <20210927220039.1064193-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/brd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 58ec167aa018..c2bf4946f4e3 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -372,6 +372,7 @@ static int brd_alloc(int i) struct brd_device *brd; struct gendisk *disk; char buf[DISK_NAME_LEN]; + int err = -ENOMEM; brd = kzalloc(sizeof(*brd), GFP_KERNEL); if (!brd) @@ -410,14 +411,19 @@ static int brd_alloc(int i) /* Tell the block layer that this is not a rotational device */ blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue); blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue); - add_disk(disk); + err = add_disk(disk); + if (err) + goto out_cleanup_disk; + list_add_tail(&brd->brd_list, &brd_devices); return 0; +out_cleanup_disk: + blk_cleanup_disk(disk); out_free_dev: kfree(brd); - return -ENOMEM; + return err; } static void brd_probe(dev_t dev) -- 2.30.2