From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EF6F318ED9 for ; Fri, 15 May 2026 19:52:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874739; cv=none; b=AbaRtFQ8oRcGsGQ3j3yzqaLkiaJevl6rV5gDx+WIekXKm+jONU1DpVyL0yCgHdvHcbB25TWsLHuKTnfN5rmMCmO8PmLb4XphBMIeELkzGyVhvY8YSdbUsCbqL7kGyT7M27uLhNuazCa9vmu9MA5gYSv2zlruVFCqU5sMFM8ZzM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874739; c=relaxed/simple; bh=xCVWl4uwmNXrwVsWzgyfOd7sqqVawCo0Cx+xJ/XQPvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cPM+fdBPStWN1SpXQfe/AAT7+JabOUiVBI4mRGTxW60BEKtLTpojKDZLYjl16qHpWJmGwe/B7wBAM6oLzZwzbmq4i40BLk5P5OAavNGFA2jnb6XKXI7bYGoyH3ZmPJe2MY0CU29CvACsGJZjl0wwA6acM1I7czv/QZnXnJc+ZmY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bsaLMlD0; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bsaLMlD0" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48e8132c6d0so1226175e9.1 for ; Fri, 15 May 2026 12:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874737; x=1779479537; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MJLq1riXpJimDOMmlqmNgk87J2NmQiv1+kjxBSblf3k=; b=bsaLMlD00/1vbEGMMn2r6WNae57WkBN2CmwzpAZiEw3TVOx3iZB0GjpLhh/IxN4Wkt OMOP4dAPRruUgkmIh3RNhE38UsS/4JIUr39CAiDpdk4B4b00ZGTREOrL8OX5yKALJWT9 TaL7KCg3v5d2kWN4t9QlagO02lR38fvhXU9HYVGWMbPPwVuNwNlAyqjaSj6aoRkMkY/B zjHS+bvoTWVCnGVdiD2gyE4TqoeGpZARKBy8Y6+dngSY3IY3pynUizFYs5m5cdCnCFIA y1y38ey0WmsEYSKMiCQdVGh3CsAw+3scFI7qCS2vpNUK5rh7RUngMnr3m9AWdZfGE/b7 iZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874737; x=1779479537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MJLq1riXpJimDOMmlqmNgk87J2NmQiv1+kjxBSblf3k=; b=X4b4vReJ+vX/6xKKnQ+QQJiKI/VaZ38U+F5HXNBCNVLlORSSxwewdj3shoawSJLyZ2 GmtTziIJdkfIYBPM1pwwaQ2npIOwqCqmr5lZB9KYSqk6tSAT62vm9+ceHA7mLR6ugUsf Z61GcauMv02DwMgLs3LcozCzPpC4/CFvqMa5JYYhK7gbyx2kRcSVRC77NBDlGh3TRvbh CUj1vp22uNw5bNM/+2bkesi7Jf+omOXT8sDM4Me25EgaaUJ0vQzXm3N4SzNvS1/46b1v kVOgfoVg6VzZpkE/bkU2fmd81wzUkJPOMbx7b1N5/AVkQt9Uzwi4N4raoOqLxqu5RSRI 17Rw== X-Gm-Message-State: AOJu0YxvrhYv5LToE1bg3kHyTdJP/AlpNFJuVqp/p1p37OuXc4Q7ajR2 euvbtr9+43ThX8t1soP8LI8z8SzBLXElWmJKX10ZedY2zbf84Bkze3A= X-Gm-Gg: Acq92OGtDqFSqy0wETqte4wQEXnpFyHPVO6mtGwKVK1TGyJxeQb+S2IAmUi16+DJD73 p6mWrry8DxHiq8eSwSETzONgj3AzSvA0r47hdfSoMCmTWsl9wAwfe3uHcghJD2UO0PC2Y+bO0RK CpeKyBqtbQhEdq9I9ctLlOOCGhA57zwb7F+Q+6xpwbsi1Y8L2iQN6s0Ia4gc325A5apg/odPkkd wHqPUfFA4H9ZjJvheEPmz9+9hjjFYVyinQgi6Oti0Jl+o+bObGqGQXz8dpFKl1qMQbu3gn3g+Pu bGVO/X1Au2yrSB9we2NE38kKTUmzhWe8ev/bOIw6OPpp3HexryxsHWgV1RODhHsfF7HLFUocY40 c6nM3m0jNki1C/2qhpCYFmVGzUcybeN9gLV3WVjnWJ1ngjeXPN3qjgQQVTizH3RFkDtLdNZqt4I rkFVnSmnarHjtWj+KpI71iObNx3N+4NRZk5gCVpwHetRKnqPrPmPA7quBroIFCLKD5DAd2lVxTv hlcZiY= X-Received: by 2002:a05:600c:1389:b0:48f:de4e:882b with SMTP id 5b1f17b1804b1-48fe60e524dmr74554545e9.6.1778874736500; Fri, 15 May 2026 12:52:16 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb24:41ce:1d7:fad9]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48febf81970sm29065065e9.8.2026.05.15.12.52.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 12:52:16 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: linux-kernel@vger.kernel.org, Florian Fuchs , Adrian McMenamin Subject: [PATCH v4 2/3] cdrom: gdrom: update gendisk capacity on open Date: Fri, 15 May 2026 21:51:10 +0200 Message-ID: <20260515195111.3295031-3-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260515195111.3295031-1-fuchsfl@gmail.com> References: <20260515195111.3295031-1-fuchsfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update the gendisk capacity of the media. Without the capacity, the block reads fail before reaching the request queue, which prevented ISO9660 mounts. Refresh the capacity from the TOC leadout in gdrom_bdops_open() so it checks the inserted media. Acked-by: Artur Rojek Signed-off-by: Florian Fuchs --- v3->v4: Simplify condition in gdrom_update_capacity() according to review feedback v2->v3: Also add quirk to handle proprietary GDROMs, using the same mechanic like in gdrom_get_last_session() try session 1 first for GDROM, then session 0 for CDROMs. Dropped Acked-By due to code change. v1->v2: no change for gdrom_update_capacity(), but for gdrom_bdops_open(): handle the failure case when gdrom_update_capacity() fails but previous cdrom_open() succeeded, to cleanup the successful cdrom_open() with cdrom_release() v3: https://lore.kernel.org/linux-sh/20260423194132.693271-3-fuchsfl@gmail.com/ v2: https://lore.kernel.org/linux-sh/20260419162823.2829286-3-fuchsfl@gmail.com/ v1: https://lore.kernel.org/linux-sh/20260405082330.4104672-3-fuchsfl@gmail.com/ drivers/cdrom/gdrom.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 094d55b2d004..603429756a34 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -474,6 +474,23 @@ static const struct cdrom_device_ops gdrom_ops = { CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, }; +static int gdrom_update_capacity(void) +{ + sector_t cap; + + if (gdrom_drivestatus(gd.cd_info, CDSL_CURRENT) != CDS_DISC_OK) { + set_capacity(gd.disk, 0); + return -ENOMEDIUM; + } + if (gdrom_readtoc_cmd(gd.toc, 1) && gdrom_readtoc_cmd(gd.toc, 0)) { + set_capacity(gd.disk, 0); + return -EINVAL; + } + cap = (sector_t)get_entry_lba(gd.toc->leadout) * GD_TO_BLK; + set_capacity(gd.disk, cap); + return 0; +} + static int gdrom_bdops_open(struct gendisk *disk, blk_mode_t mode) { int ret; @@ -482,6 +499,12 @@ static int gdrom_bdops_open(struct gendisk *disk, blk_mode_t mode) mutex_lock(&gdrom_mutex); ret = cdrom_open(gd.cd_info, mode); + if (ret) + goto out; + ret = gdrom_update_capacity(); + if (ret) + cdrom_release(gd.cd_info); +out: mutex_unlock(&gdrom_mutex); return ret; } -- 2.43.0