| Message ID | 20211013051042.1065752-17-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/29] bcache: remove bdev_sectors | expand |
On 10/13/21 12:10AM, Christoph Hellwig wrote: > Use the proper helper to read the block device size. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com> > --- > fs/jfs/resize.c | 2 +- > fs/jfs/super.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c > index bde787c354fcc..51a8b22e71030 100644 > --- a/fs/jfs/resize.c > +++ b/fs/jfs/resize.c > @@ -199,7 +199,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) > txQuiesce(sb); > > /* Reset size of direct inode */ > - sbi->direct_inode->i_size = i_size_read(sb->s_bdev->bd_inode); > + sbi->direct_inode->i_size = bdev_nr_sectors(sb->s_bdev) << SECTOR_SHIFT; > > if (sbi->mntflag & JFS_INLINELOG) { > /* > diff --git a/fs/jfs/super.c b/fs/jfs/super.c > index 9030aeaf0f886..992870160903d 100644 > --- a/fs/jfs/super.c > +++ b/fs/jfs/super.c > @@ -551,7 +551,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) > ret = -ENOMEM; > goto out_unload; > } > - inode->i_size = i_size_read(sb->s_bdev->bd_inode); > + inode->i_size = bdev_nr_sectors(sb->s_bdev) << SECTOR_SHIFT; > inode->i_mapping->a_ops = &jfs_metapage_aops; > inode_fake_hash(inode); > mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS); >
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c index bde787c354fcc..51a8b22e71030 100644 --- a/fs/jfs/resize.c +++ b/fs/jfs/resize.c @@ -199,7 +199,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) txQuiesce(sb); /* Reset size of direct inode */ - sbi->direct_inode->i_size = i_size_read(sb->s_bdev->bd_inode); + sbi->direct_inode->i_size = bdev_nr_sectors(sb->s_bdev) << SECTOR_SHIFT; if (sbi->mntflag & JFS_INLINELOG) { /* diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 9030aeaf0f886..992870160903d 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -551,7 +551,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) ret = -ENOMEM; goto out_unload; } - inode->i_size = i_size_read(sb->s_bdev->bd_inode); + inode->i_size = bdev_nr_sectors(sb->s_bdev) << SECTOR_SHIFT; inode->i_mapping->a_ops = &jfs_metapage_aops; inode_fake_hash(inode); mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);
Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/jfs/resize.c | 2 +- fs/jfs/super.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)