Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4341990pxb; Mon, 27 Sep 2021 15:02:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwY9uY8frrcG6ZrKId5ji/z07TViytg1MGL3OQSOjg/OjeV0velxc6ofjvbjUIz0g/twKZO X-Received: by 2002:a62:1ad6:0:b0:440:3aef:46b7 with SMTP id a205-20020a621ad6000000b004403aef46b7mr1893217pfa.86.1632780127695; Mon, 27 Sep 2021 15:02:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780127; cv=none; d=google.com; s=arc-20160816; b=NNaij4HjzFY2LS91Ou1Sz+3gLby6fn3NiLj+/g5Iq7gKObRcVaDvHgsf8OSZLlIlCy jv8MnsLJd6cLZN+gpZ8YNlO/PypNavU/ZI9/sLAxfcgmh16haXmEin9OkYbCzsz9U5yO nfr7+0sVAZ9s0MaNNjW1drIKJB/yWCKGIqKvaDVF/DFnG6eNraq6RqNBBHzSakRnf1zM IaBM2wcQlI1FwR6b0WORRZnvWwV0JERjdPvyqrZRHnicN8N3HQAaEG5Bth74C8MM+SUi n26R8HgACvnxp9llTLeDOPZ14u9HmfX+jdP+lEfwSIgXrDCBRqs1A/2JusP9RlMKf15k gWXg== 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=GSnwJGqE24fGphaFobcSY6Y9xf4YP0gJ4SZNHqUVKO0=; b=wLqYxAyFyt+sbhEVombeF/KRomGav82dLbtyMn0byg6UKxJpitNTyh4z4oe/W6caQE qRdGUsbE9z6WR1I/ptdgm1s/FZFX6zpN/mAMjvJmk5ntvcNccUzXDNACydwaIUDQVP1M qee7fdGisKZCxsnCXGfsDQqLIoEKk6Y0kVHxihwsG6/AShqNhwj3mlz2n5k6LGJchR1d pOMfR5dg3gDSiU5QPARD1Cd4m47DNMMUnGEgBvD6D0edr+Mb9Xdiotvv6E/xbuNroMSF 3gQnmRbr4BiwECJcJQKIudQwa6Vn/is3QmstQT2iEvCTFFbfRviXhhuy5zfjRtbqmiwF v79Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=rrId4nxV; 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 w190si23624471pgd.57.2021.09.27.15.01.54; Mon, 27 Sep 2021 15:02:07 -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=rrId4nxV; 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 S237612AbhI0WCY (ORCPT + 99 others); Mon, 27 Sep 2021 18:02:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237404AbhI0WCJ (ORCPT ); Mon, 27 Sep 2021 18:02:09 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4554C06176C; Mon, 27 Sep 2021 15:00:30 -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=GSnwJGqE24fGphaFobcSY6Y9xf4YP0gJ4SZNHqUVKO0=; b=rrId4nxVmKTX2ZVroe7YTkZBoU M0GYACDk+yZdRa8ni89+7dCtMej5oBN3DKfmxRhXECVLY7YcTqa8tLBakNUoX0yvO/P/O9frTwHJY iJ+IVfvyf+uyZv2Q5gLSp43KDW1ZYQ3v2X/nWPujtpiNFKiF8E+SryBriKzQwift1AGwxU7Q2xPBD fTFO8OTA9RQBE/xJyfn+uyEuiGp3KLt2RQ0eUQ/MUj8gY6GJwwm+67luU25bpLuF8+XiKMPfOgqdt yulArpkEM8PTYtdWqgYQzL9AzTSujLL4xofUnpktsNAA0v0TkX2auYGy1JCFLcEJpnlBWdMWqyCfg jDhINijQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyfM-004SUx-Sp; Mon, 27 Sep 2021 22:00:04 +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 2/6] scsi/sr: add error handling support for add_disk() Date: Mon, 27 Sep 2021 14:59:54 -0700 Message-Id: <20210927215958.1062466-3-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. Just put the cdrom kref and have the unwinding be done by sr_kref_release(). Reviewed-by: Christoph Hellwig Signed-off-by: Luis Chamberlain --- drivers/scsi/sr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 8b17b35283aa..d769057b25a0 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -727,7 +727,12 @@ static int sr_probe(struct device *dev) dev_set_drvdata(dev, cd); disk->flags |= GENHD_FL_REMOVABLE; sr_revalidate_disk(cd); - device_add_disk(&sdev->sdev_gendev, disk, NULL); + + error = device_add_disk(&sdev->sdev_gendev, disk, NULL); + if (error) { + kref_put(&cd->kref, sr_kref_release); + goto fail; + } sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name); -- 2.30.2