Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2846834pxb; Mon, 18 Oct 2021 03:13:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNKr9H9mFMsc1LTVkFouZohOr0OeYYsSrvks3iE10xR8vk2Iidvuecvt3FvO+wgPTy9Gqf X-Received: by 2002:a63:ea48:: with SMTP id l8mr22765768pgk.99.1634552023799; Mon, 18 Oct 2021 03:13:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634552023; cv=none; d=google.com; s=arc-20160816; b=WyTMhh6O3SNN+ZMjzEc8R1P7WjKqZWr8KjSFMcnKLjhi0GWn5E6q8B2L0l/1Qc//rI YRgsIDYMWZHpiRu6jX4yj4aZwVPTBa0zZJtvFh3XRimYrZqT7vw1ZVe02euW52U/mBE+ ghXB652o0GobpkLAmjO7bsqnVCn/fLs+iH8Kw3VnfCrV5w2Fiup+Y70pe9YRst2L+P6B 2Meapzv4bDDE77Wyj8Sc1uE6b2xtQh/uKp/whCFcr7PBAX14TRsedm6xa6XpyP74SNx+ IL7j2D/z3//JAysfVNDqf5UAjjUqa0n7BCyKTbdF6aGwIIA1aSv1t6Ep27Lc9lrJjD74 8NoQ== 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=BEMGsHVLTIykAoNtwRps7ZgL75VOsiTXMqaq61KcMi4=; b=oHlb6N/nINuC3iR0B5ZBmYEni515/UdLlOGsMBqWzcVwBoPLcQSmOuyS9N4IngSlZ9 wLViuOTIBr+uwXi0D6RrvH6A/UIzGd1fUkTi6qoxA4rf2eBOrOw8kMiidYYX4avXnbJv FXjcgCHrkl7giTCwK++Qj/jIPi3o28j31JxJ7yHYGDG8BM4PHJhDcakP0C9VqrLAJKOk 4v/NyI2JUGNY6A6TsTR4FUn1f8CfXTFHAGEFlE436iUToEjS9x8C4DvMpnRiJA6ttNx+ aD7JM0W3+nB6bOVQy7wkOl8e2jX6vLFosRxgmH0pwkXo0mlmYT6KAnrh5QRrgUY59rBO UT/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=GFVOWoFI; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-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 b15si580119pfl.34.2021.10.18.03.13.31; Mon, 18 Oct 2021 03:13:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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=GFVOWoFI; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232055AbhJRKPg (ORCPT + 99 others); Mon, 18 Oct 2021 06:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231524AbhJRKOV (ORCPT ); Mon, 18 Oct 2021 06:14:21 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5850DC06161C; Mon, 18 Oct 2021 03:12:10 -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=BEMGsHVLTIykAoNtwRps7ZgL75VOsiTXMqaq61KcMi4=; b=GFVOWoFIJ7rI0uLenhDqNHpAr3 N7x5J1Ijsj2ubyEmzpwqUst8DOmvwcPuM+Gal8+Jd6TZysFuFQiqqmtNXvW844AWL7ZEyrF76Dbp1 yD63/N5ZQqTRJZ+RllJyZ1whw0ipl0ZKeZKNTWIAy62Gvt4njego0OsAYr+Qz0SrwEuEU3h9oAdEZ gjNvCf6TuVfwVi0EHIM6Hv/oKHT2h4QsnZmioDNpk9wqIoyrQD8+xm9MRJf6SFc0v+rWXpuwYwr8m XPVO87GCFXjQgU6kvZE0nQl9J3lSfwDRgLTcVBcvMDv18wbDCYmiB0A5dHjA8zzsFxSZtnplUsvnX tO+BIFZQ==; Received: from [2001:4bb8:199:73c5:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcPcb-00Eu8m-81; Mon, 18 Oct 2021 10:11:57 +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: Mon, 18 Oct 2021 12:11:09 +0200 Message-Id: <20211018101130.1838532-10-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211018101130.1838532-1-hch@lst.de> References: <20211018101130.1838532-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-nfs@vger.kernel.org Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig Reviewed-by: Kees Cook 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