From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A6E314A98 for ; Thu, 14 May 2026 17:58:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778781521; cv=none; b=myzKHoRvKaUWdZ4+/bQxdMWiRJVyhsW0xHpagYL66CYB9a3ZaPMhKpclWBONpkjf3Es9Jv6HMNKl9lBPtMwBHNNF3cuR/AKvIth+eJejXu4ZrCL2gr2pz2Gz9tJXjbD/fmsQA3uwsrez0zm+Ar7LePztIPee2Y4osRbCLAHVuGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778781521; c=relaxed/simple; bh=wuJeNaxl3TE0stnA8RyBanmZvJeaUNRKWctGs86zin8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NjxorYVGQxtfS88Uh4bVEgqdLZMQxGumRvASIjj5x6vH6hVfvkBU7qn3SvtqT5orH5xbQYY+g/ydyze77GJ2eaVeZjR6PDQ7xgREo23nvZz2LBmJjY6UdoLF7rWv+I4s6jcHjnolJPyXcJb/93+5Irb9+xLe3KCr/gKCpHtUP/o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UQeOgyZx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UQeOgyZx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6643BC2BCB3; Thu, 14 May 2026 17:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778781521; bh=wuJeNaxl3TE0stnA8RyBanmZvJeaUNRKWctGs86zin8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQeOgyZxAVHNc+G9dxiBouD9W10x8HP3JKLMCb9TyKfOUIy780yfQiK7eDf/1h+M5 Qrr0MrnILi3b8Nrq0rajI2pRglNMAWGtio+lFL2vP+psPCGVTjB/XSt1Qklt0BpZny qlTFb2oIV6iB5dd5W0dYTjDR0rQvzCdqUKt6WJCyV3fR9YyBzJ4BaAHHg2Crd7hUX8 mMSZqwaaQyUiPjgfOLKXwABDof8X+LANH3CxRCDqqpcdMoNl79xyF4uE4QlXUof4mS toZPzKxAdGztNisxzzTfO5agbCL4kD4q1f29oTataPiRqOGuvEGA9KinE1MBltwgdp blvOaR3oFm8Dg== From: Sasha Levin To: stable@vger.kernel.org Cc: Damien Le Moal , Christoph Hellwig , Bart Van Assche , Hannes Reinecke , Johannes Thumshirn , Chaitanya Kulkarni , "Martin K. Petersen" , Jens Axboe , Sasha Levin Subject: [PATCH 6.12.y 1/3] block: cleanup blkdev_report_zones() Date: Thu, 14 May 2026 13:58:35 -0400 Message-ID: <20260514175837.526481-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051255-scale-proactive-9452@gregkh> References: <2026051255-scale-proactive-9452@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Damien Le Moal [ Upstream commit e8ecb21f081fe0cab33dc20cbe65ccbbfe615c15 ] The variable capacity is used only in one place and so can be removed and get_capacity(disk) used directly instead. Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig Reviewed-by: Bart Van Assche Reviewed-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn Reviewed-by: Chaitanya Kulkarni Reviewed-by: Martin K. Petersen Signed-off-by: Jens Axboe Stable-dep-of: b7d4ffb51037 ("block: fix zone write plug removal") Signed-off-by: Sasha Levin --- block/blk-zoned.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index f63070f0e4405..c9b5b590400ab 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -163,7 +163,6 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data) { struct gendisk *disk = bdev->bd_disk; - sector_t capacity = get_capacity(disk); struct disk_report_zones_cb_args args = { .disk = disk, .user_cb = cb, @@ -173,7 +172,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, if (!bdev_is_zoned(bdev) || WARN_ON_ONCE(!disk->fops->report_zones)) return -EOPNOTSUPP; - if (!nr_zones || sector >= capacity) + if (!nr_zones || sector >= get_capacity(disk)) return 0; return disk->fops->report_zones(disk, sector, nr_zones, -- 2.53.0