| Message ID | 20211013051042.1065752-13-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/29] bcache: remove bdev_sectors | expand |
On Wed, Oct 13, 2021 at 07:10:25AM +0200, Christoph Hellwig wrote: > Use the proper helper to read the block device size. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > 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); I find this less readable than "bytes >> PAGE_SHIFT". I'd suggest this use a new bdev_nr_bytes() helper.
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++) {
Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/cramfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)