Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp813974pxb; Fri, 15 Oct 2021 17:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8u6p8aGiOTE5HX/JGZUCk6m+SeICkVkopsljo7elNV9ufzxmMDHIW/eAxxxU/Nrj/hRst X-Received: by 2002:a17:906:8893:: with SMTP id ak19mr10707220ejc.124.1634342760532; Fri, 15 Oct 2021 17:06:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634342760; cv=none; d=google.com; s=arc-20160816; b=HtECaY5nBrjd4/Pnjh2pMCGkF9TbYrSM32gszhjtH2tZ5bW4LK36jappObKQpKLjFQ dA+ykt2Ni0tNzv8kAV3pLLdX/qm80eNdr1ovsthC6VpheUwCJP1gwUiVfvDEKP3LWTV+ rd1IfPOYooE1LFgsw0km5diYRvTmu7WIN6wf0u04tAnVc7EO9I/taAwEakot1sAYbB1y fcYo8sl0NSvniiqbS7IEb7kpb0ne+Jik06yQBGXrOlnJppRbgqqgNmrfoVUj3VwdzaAJ BzN74udoHGRyb4uTllWLlmOmTJ5ZipZ8iQpNWvcWfgKPCXcyAIAIkwm0LL+M+Ksst8Oi LjjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=brrNeCrpSVGZomYuK+0XdDRpBpOzq/Tfwu+Oh+282Uo=; b=n4npC5jn/k3QwNtOHpnKt2sAgx+FzDpf0bRf7v4uexgDsXsEuVzwUYZZI+Oa/SJXoa IA14WpMhVTKsNj5Nue5CE8m4rSAQxmIdLV+yBLCVc3EvxNXvEWA6RFCaiVFxOIA72SCl bTpWNZpL4Nw8OIW+kxHyxcPayZBvxJ9lrEjbYxeGonWff14WNeAvFTmm4+XIFI4B17s2 1Gbj681CkS0/FoCJjXDG6r2X8yGaTYKpR1p0Oce+5WP67sa8VcUty3hSpE2s3C59RA1d he3zs+l5COfzo+/3w8Z2vbBqX9eQUVElK9Dum696I3bnt+WBi78Lu9DeisZ/JJy1lc1u VOmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=IxLeKtcq; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si9123540ejm.455.2021.10.15.17.05.37; Fri, 15 Oct 2021 17:06:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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=IxLeKtcq; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239596AbhJON3x (ORCPT + 99 others); Fri, 15 Oct 2021 09:29:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239487AbhJON3a (ORCPT ); Fri, 15 Oct 2021 09:29:30 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43453C061764; Fri, 15 Oct 2021 06:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=brrNeCrpSVGZomYuK+0XdDRpBpOzq/Tfwu+Oh+282Uo=; b=IxLeKtcq5OzxV91L8hTsh+7Wn6 GlocDXjqZDpKZlfP0UYVJ6BEdGYan+wi1rVHDqD7apTedacgzPz/ay+ildx+shvtzPpsAEQ1PxRZu F+2A+Xp7CEiJPBI1rRydwkIH3jEs5fLQZYWGW7ZpoXWC7/sqRQB4Q+yfmq/NjEBYZFGbvSIFKLP+5 HZ4numWQM2crsRS3Y0bBhZdCBgmIt8jZTZI3m2/tYEQs9btUPJ0nPqDcW8keyyKPd6rkEI37HdlUh /Iaszs3O8OiNHbWqQ1Xfy8qE3WbJ7te1x7WzzugXIOJXRQ3cv3Gn1lYYgA5DwQWsjfPpsJA9Bqe7z peZfYXaQ==; Received: from [2001:4bb8:199:73c5:ddfe:9587:819b:83b0] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbNEr-007CtU-GU; Fri, 15 Oct 2021 13:27:09 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Coly Li , Mike Snitzer , Song Liu , David Sterba , Josef Bacik , "Theodore Ts'o" , OGAWA Hirofumi , Dave Kleikamp , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Kees Cook , Phillip Lougher , Jan Kara , linux-block@vger.kernel.org, dm-devel@redhat.com, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, reiserfs-devel@vger.kernel.org, Jan Kara , Chaitanya Kulkarni Subject: [PATCH 09/30] fs: use bdev_nr_bytes instead of open coding it in blkdev_max_block Date: Fri, 15 Oct 2021 15:26:22 +0200 Message-Id: <20211015132643.1621913-10-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211015132643.1621913-1-hch@lst.de> References: <20211015132643.1621913-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Reviewed-by: Chaitanya Kulkarni --- fs/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/buffer.c b/fs/buffer.c index c615387aedcae..156358977249f 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -878,7 +878,7 @@ link_dev_buffers(struct page *page, struct buffer_head *head) static sector_t blkdev_max_block(struct block_device *bdev, unsigned int size) { sector_t retval = ~((sector_t)0); - loff_t sz = i_size_read(bdev->bd_inode); + loff_t sz = bdev_nr_bytes(bdev); if (sz) { unsigned int sizebits = blksize_bits(size); -- 2.30.2