| Message ID | 20211013051042.1065752-22-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/29] bcache: remove bdev_sectors | expand |
On Wed 13-10-21 07:10:34, Christoph Hellwig wrote: > Use the proper helper to read the block device size and remove two > cargo culted checks that can't be false. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/reiserfs/super.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c > index 58481f8d63d5b..6c9681e2809f0 100644 > --- a/fs/reiserfs/super.c > +++ b/fs/reiserfs/super.c > @@ -1986,8 +1986,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) > * smaller than the filesystem. If the check fails then abort and > * scream, because bad stuff will happen otherwise. > */ > - if (s->s_bdev && s->s_bdev->bd_inode > - && i_size_read(s->s_bdev->bd_inode) < > + if ((bdev_nr_sectors(s->s_bdev) << SECTOR_SHIFT) < > sb_block_count(rs) * sb_blocksize(rs)) { > SWARN(silent, s, "", "Filesystem cannot be " > "mounted because it is bigger than the device"); > -- > 2.30.2 >
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 58481f8d63d5b..6c9681e2809f0 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -1986,8 +1986,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) * smaller than the filesystem. If the check fails then abort and * scream, because bad stuff will happen otherwise. */ - if (s->s_bdev && s->s_bdev->bd_inode - && i_size_read(s->s_bdev->bd_inode) < + if ((bdev_nr_sectors(s->s_bdev) << SECTOR_SHIFT) < sb_block_count(rs) * sb_blocksize(rs)) { SWARN(silent, s, "", "Filesystem cannot be " "mounted because it is bigger than the device");
Use the proper helper to read the block device size and remove two cargo culted checks that can't be false. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/reiserfs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)