Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp986922pxb; Wed, 3 Nov 2021 16:08:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhBC7UPA3Oc7aDgpotTen5xtdJLhplR+1EleJtXKZAiROOmXw+xLrUWLW5m0bRxRcNtQ82 X-Received: by 2002:a17:907:7f2a:: with SMTP id qf42mr55015037ejc.139.1635980890174; Wed, 03 Nov 2021 16:08:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635980890; cv=none; d=google.com; s=arc-20160816; b=snfkUQayZoeH1yZN59rQ32c+BryfyCWQH8QalAYIf/BMfz4gctsCLYOj4uzvcZvYbR 5e5doAozz2p49PRBl7Eua5MzAZux5iyJCOmyYvIqu3pMbB4YooeVqCxBmcPkB4Gvvjav EBVXv2Ocv8WZkd/OOs2GrcW3BlXKcW9ndmJRpuxR6UpW34eQhX8Him7tyu9mll7fLQm+ PWHvAUjwogbnt0OsWN50L3uo20mLrzhEeuzsBWgMdBvRjC8HHMUtlCDPBSyHSNU5pUEz eKLONTLX/8LKRN+ebN6eSkfD/0/+fgIYGR+iKhTlT8cTEaZbW7rQj9WgrsAQhbflitfo 6S3g== 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=+G0HrywYCBknnU1QiNcJpSRJV8fKSVVdTBscrCYx8+A=; b=Bc4XJd4aggE6io8sgsS6m+4VVIwQO7rrV6fe1OBpdfgrOg+bAcHlpSZaSZOeFBmyCu w5b4eLCoLodffNPt2dP161xkGVHzg3tc80dG/XTTpVJi1f0exjcc1334Wl+ZKyczkMN9 meKei0USMmxmgEHwwSl5JQxebBiNhA+PgxWiorymPin4vqYqd2RUAgM+gmOPyL6VAdsj UPsAJozYU54Nqs/Xrvrav5XsyrsDf/RXg7vjV3HBGYYtuxu90rWNFmDwqhjZMQIrtplX MpjMmTfXaRtm7H5p4ezjykRT4TWh6q88sUmnI02KPW/lPlVd7k6w88tXLwc6exVarb4/ S4cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=Zmqaf5rD; 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 sa30si6386619ejc.246.2021.11.03.16.07.32; Wed, 03 Nov 2021 16:08:10 -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=Zmqaf5rD; 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 S231240AbhKCXHf (ORCPT + 99 others); Wed, 3 Nov 2021 19:07:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230302AbhKCXH2 (ORCPT ); Wed, 3 Nov 2021 19:07:28 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E590EC061203; Wed, 3 Nov 2021 16:04:51 -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=+G0HrywYCBknnU1QiNcJpSRJV8fKSVVdTBscrCYx8+A=; b=Zmqaf5rDkt5BDgJ7358IxzRO6L XYuL/LPlxrmXXxk6CReFpJeC8CNnR6Xn3GeW1dFC6BTz4AD5oGR8Z4KuSY2xHaMbnnYf5a24ruCVn wYIMvRI9O0ZU4aJfEliph7dDmGxH7oAJeL79U34TIrSuc5R4aY/cVXN0wbr25TvyTJ6pG7o0dne5g n5LDSiQOV5lMgrJsBcmtTBuFGY5pt3Nztn8i/eu7exI+yRg8nYPNBsMMyNA3EXAdAKYYS0VpeJE0j 8mmZfqCDJ4abGMYg1bWb8o+XEMJ5sLtOamvDK9PoixHGHji9J6SK0tP1eoMhlcQi/S/e7rF4P0HD9 6GBcHewQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1miPJ8-006seb-Og; Wed, 03 Nov 2021 23:04:38 +0000 From: Luis Chamberlain To: axboe@kernel.dk, hch@lst.de, penguin-kernel@i-love.sakura.ne.jp, dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, richard@nod.at, miquel.raynal@bootlin.com, vigneshr@ti.com, efremov@linux.com, song@kernel.org, martin.petersen@oracle.com, hare@suse.de, jack@suse.cz, ming.lei@redhat.com, tj@kernel.org, mcgrof@kernel.org Cc: linux-mtd@lists.infradead.org, linux-scsi@vger.kernel.org, linux-raid@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 09/14] mtd/ubi/block: add error handling support for add_disk() Date: Wed, 3 Nov 2021 16:04:32 -0700 Message-Id: <20211103230437.1639990-10-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211103230437.1639990-1-mcgrof@kernel.org> References: <20211103230437.1639990-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 Signed-off-by: Luis Chamberlain --- drivers/mtd/ubi/block.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index e003b4b44ffa..062e6c2c45f5 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -447,12 +447,18 @@ int ubiblock_create(struct ubi_volume_info *vi) list_add_tail(&dev->list, &ubiblock_devices); /* Must be the last step: anyone can call file ops from now on */ - add_disk(dev->gd); + ret = add_disk(dev->gd); + if (ret) + goto out_destroy_wq; + dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)", dev->ubi_num, dev->vol_id, vi->name); mutex_unlock(&devices_mutex); return 0; +out_destroy_wq: + list_del(&dev->list); + destroy_workqueue(dev->wq); out_remove_minor: idr_remove(&ubiblock_minor_idr, gd->first_minor); out_cleanup_disk: -- 2.33.0