Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3123808pxb; Tue, 12 Oct 2021 22:28:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwaQ5EcKpYYZ069LKYDA1pkII4WS9plmO6rVivn0TQhKHcKE2ndfFHTZo2/B+vrulm0/fG X-Received: by 2002:a63:4f57:: with SMTP id p23mr26134616pgl.376.1634102902495; Tue, 12 Oct 2021 22:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634102902; cv=none; d=google.com; s=arc-20160816; b=AOtAMGiaNraPTca7DgL1cY2jVpE3yVqKpwH07GV04cljmLQogk6bq7ubJaRy+CTSGB uZVas6zXjoemyLANeKm3PxBFUqAGK4bp8fOpCZ+i93TD/3LW8JnyEJ4rGVWmJGHr79o0 ibQ5HldUtPUGBHNBBp9kKuv8wXYlbrENFQTdxgOf1L1MeYlUUqsO45GNMY6lhCmAAfn/ rjmOWoN+4VUa+3hgi11Yhgvt74wffnbjM9UMShr25w6nM6ISwlh8mrr3jZRP4BVSmoJK VXqQXhLr9stHd0T45xW9bYdTwAETZGICaxwNzyAWDL9PCOm39BGNtift1XxPGPmOU8fv hHzg== 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=RuQql9PAJvmACL7i0h0xGgkkp1rdpC0kgf+XgcS+6Uc=; b=MzhmdL8i9EkGGtzZRhQgNTcudQWp1Z4JKkev2ImfqDFF74u4iaEIM7FSnYBYNZcmci SrolKbut8uHm957+pPFn8V7Vbydguc/1P8BaxQk68Fji0WH/5ydvV5kOGnnUUnjG/jBw s9tFDetfjG9Snxpeod02Ep2qveve9x+jVjcExh1MhkqkOuM21PXksiADu34RsU9FSX5n SBBDgG2WyQAxkwxAsHcAj/FF/P686ZYaaXfChF7RUjrW8YeTdzWOrJzD/q/AHrwBpSov kWcIJfV2egNrOQ3wSbkXbjgEYEIPhvEr/ZFKtrUZzIoz5DE/2ZAaVjViWKYqjrJ331zZ NuCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=ZDnfJ4tj; 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 m2si21115822plx.403.2021.10.12.22.28.09; Tue, 12 Oct 2021 22:28:22 -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=casper.20170209 header.b=ZDnfJ4tj; 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 S231494AbhJMFaJ (ORCPT + 99 others); Wed, 13 Oct 2021 01:30:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbhJMFaJ (ORCPT ); Wed, 13 Oct 2021 01:30:09 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BA96C061570; Tue, 12 Oct 2021 22:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=RuQql9PAJvmACL7i0h0xGgkkp1rdpC0kgf+XgcS+6Uc=; b=ZDnfJ4tjhTm9Mn7WDgxDF2q0Ka tcVQf+6r7CGUE4Z8KmpJebFSbalpD5/KYotd4fqypU0M78aGqiy0pQaTm52IKG27Z4Au0kTPkOwwo gg4bf9iHYK/uAaRdL6Q1ojBwxLmETr7haaRPmz0ih5VYskV7ZVdHHcesAG4GuWbzgCEbT8PIkcCb4 MGajLqXkZezJCfHWYOi3Swt9cSDtP2d5kfZCurDldYeZxM4GQPfVElexk1xd92Kpv1aYsTExOG6te o2iRMSucS2M2zB2QLauGfzkHLJedeSzGjaihUqcMN27wENvi9tRQC/4DJamJ3T0IWaTikE21cJ2AL p/h3oWDw==; Received: from 089144212063.atnat0021.highway.a1.net ([89.144.212.63] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1maWkO-0076qI-Ax; Wed, 13 Oct 2021 05:24:43 +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-mtd@lists.infradead.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 Subject: [PATCH 12/29] cramfs: use bdev_nr_sectors instead of open coding it Date: Wed, 13 Oct 2021 07:10:25 +0200 Message-Id: <20211013051042.1065752-13-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013051042.1065752-1-hch@lst.de> References: <20211013051042.1065752-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.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 --- fs/cramfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 2be65269a987c..3e44cc3ed0543 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -209,7 +209,7 @@ static void *cramfs_blkdev_read(struct super_block *sb, unsigned int offset, return read_buffers[i] + blk_offset; } - devsize = mapping->host->i_size >> PAGE_SHIFT; + devsize = bdev_nr_sectors(sb->s_bdev) >> (PAGE_SHIFT - SECTOR_SHIFT); /* Ok, read in BLKS_PER_BUF pages completely first. */ for (i = 0; i < BLKS_PER_BUF; i++) { -- 2.30.2