From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 535DB2D060D for ; Sun, 19 Apr 2026 16:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616155; cv=none; b=khxWvBWklKWVRB65CyBoteS37rp/WT/ZJaWOAMr6ljZIHvorrlu4AJpxveV8AkoXvg07fav3Kv4KgF25iQnhcAWgFtFfNTt711jM3VP/UgwMDeWe0vnhawg2qhZgS9atVrhFylH/HLHAUdeztxuDHhQ2yYTrJ5sw+63H0XXkdGc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616155; c=relaxed/simple; bh=/0TEkY+sxpaC0GlCPNbeaHDoXij7IeFeKG2B7njq+AQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PWyMot0jKpJyt3Z4tG2hy7joXey8HQOCRDUYtpZUt4soNscidQVEQTMwRYN+HRktpa+zU0MKyi5FWyVGN144buP6WFb3hBgcSO6EJw15F4qYLV9bTjrhcK7o4EQcW7rxFsbvoUvmrnEpuBPvFkgojYp+0hn3vT4VDuh6/9nSYqs= 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=nh1UoKJ/; arc=none smtp.client-ip=209.85.221.41 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="nh1UoKJ/" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43d77f60944so1743229f8f.3 for ; Sun, 19 Apr 2026 09:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776616153; x=1777220953; 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=CG0WEefAtVYQQDx1GALJY/zb5ptlk38Q48NQwoW8PzY=; b=nh1UoKJ/VOa8G1i/gyBJpRmUqnOuMx2alI5jWvWvyY6lO14gWWaVcfgd0xdvDLx3f6 4c+I4E12dv4SOOk3aawG3NkJElWRs34cxuC0V2uOIGcrcypawfF+h+Qv8/H682YvKq60 8g9htjIxPTZmkU7aaIGobvzOl4pKndHtoK1hVxnotZSfSp3V/Hsd0gIDvy2DuYeEHVyq wWJEJEdENgELpK+FbVTfqWlCD0q6DN6TxzNRXgHPsiMY/Uizth/nv4ObE+vDSbxVZ/e6 wfmjc2i0V80Hm6Voc3HC7mug2i39JrI/LuZNVS8QQFStd2Xvv43xZELVsMGmW545T09m HQ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776616153; x=1777220953; 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=CG0WEefAtVYQQDx1GALJY/zb5ptlk38Q48NQwoW8PzY=; b=Kdak/0wtq6GZ80JqJleVUj+wZjwrSTbmN2BHkWF+0rWkTgRTw0ubBSAGYz7NWimn8s L+/Tg13OkIOyDQ9G0PBGAVRQ4CfSXek1VbpfrWnMAcJ/Jch92wFZ5YRN1BOSZ1dRSiL6 ondo7JnDAYDb5kjvAaHQfan2elqQcXo66XUQCE5tVyMKgESY0u3TMf/8wdquSLP/ABNJ Qig1bZihXuR7qEa+ljMz2N5ny++twY/KNEQvquhrYo1bpnF8TCTdidfXn9LpUTq8FFgt eeHEQaj7lQ4tWGLw8Frzva1f4XVLf7TlWy2CEkvtxukvyES9aMnQ4c9UIjbAa2g7EeNs Xh3w== X-Forwarded-Encrypted: i=1; AFNElJ8yWzAxgv+3bMbvXG3jFy8/A4YpxPPbEgUpGhNxOfNhtNTwKJ8GT+mQYgkCNHqok/QdoqUV3h/YdIQDce4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt3+E53cBvyzp/YBKGvyAROg9veHj10t0kVwBwSzz9fmKzVXrA G3svDm45/exfSRbKYqbmMeBE+gIGDpD9VzrYyYhYp3LOMOLpxV3hWoI= X-Gm-Gg: AeBDievqbw/K1AIaqQCsykDjaLfVoEU1a8FOPjN1mZtsOIEmJi+DWKqSmwUrwOkv1dQ lDuXCW0m7u7h6Ut6uL0SymmYnjhWbnM66CV2Zl0YQImZagXS81hndI5+pE0xZpfZAReX2+Z0B7K afZKqjx5IZ+GK9vDshBarlyIvYaokR+eXkaoku7Ro+c1znU0UeCHyzSrfAy17kq8Q5ksLdBCIgO 1mAmgsXMLiotWeUan/yJ6UCO4jJhPN5mouyAPrvXL2lqe9JMLJdrp4+QMRHG2qRP2wGP3uIHlv+ 1na4FSkrgCjuwvp3hguI+RqWJM5CDCtJkEwmBGTn4kLmSLkOJOJEb08d6I67CDJv4VfxPHSE3x7 LMZSeiolLOaMGJ1b9f9Qe1F9LSnrVbqpX5EaOfJ78HY+2fbROJjGvnPT7NpH5vBS4STuqObO1JK TVawbzb5X+TenfDQwvV7fb1h5yCHPFQPs4xhde+e5Co3/lF5xMwhqTOOpjt+4yH8gxc6bIIKh/L itXsXfVMZYh/keJEm4= X-Received: by 2002:a05:6000:2dc3:b0:439:b1c3:84c8 with SMTP id ffacd0b85a97d-43fe3de2bf5mr15121663f8f.21.1776616152477; Sun, 19 Apr 2026 09:29:12 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:e7d2:9a54:d18c:d3f3]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4e591cesm29467804f8f.36.2026.04.19.09.29.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2026 09:29:11 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: Adrian McMenamin , linux-kernel@vger.kernel.org, Florian Fuchs Subject: [PATCH v2 2/2] cdrom: gdrom: update gendisk capacity on open Date: Sun, 19 Apr 2026 18:28:23 +0200 Message-ID: <20260419162823.2829286-3-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260419162823.2829286-1-fuchsfl@gmail.com> References: <20260419162823.2829286-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. Signed-off-by: Florian Fuchs --- 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() v1: https://lore.kernel.org/linux-sh/20260405082330.4104672-3-fuchsfl@gmail.com/ --- drivers/cdrom/gdrom.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 89938d9b2825..fb95288fad72 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -474,6 +474,25 @@ 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; + int ret; + + if (gdrom_drivestatus(gd.cd_info, CDSL_CURRENT) != CDS_DISC_OK) { + set_capacity(gd.disk, 0); + return -ENOMEDIUM; + } + ret = gdrom_readtoc_cmd(gd.toc, 0); + if (ret) { + set_capacity(gd.disk, 0); + return ret; + } + 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 +501,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