Commit 4fcd6979 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nilfs2: use bdev_nr_bytes instead of open coding it

Use the proper helper to read the block device size.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Link: https://lore.kernel.org/r/20211018101130.1838532-20-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6e50e781
...@@ -1107,7 +1107,7 @@ static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp) ...@@ -1107,7 +1107,7 @@ static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp)
goto out; goto out;
ret = -ERANGE; ret = -ERANGE;
if (range[1] > i_size_read(inode->i_sb->s_bdev->bd_inode)) if (range[1] > bdev_nr_bytes(inode->i_sb->s_bdev))
goto out; goto out;
segbytes = nilfs->ns_blocks_per_segment * nilfs->ns_blocksize; segbytes = nilfs->ns_blocks_per_segment * nilfs->ns_blocksize;
......
...@@ -403,7 +403,7 @@ int nilfs_resize_fs(struct super_block *sb, __u64 newsize) ...@@ -403,7 +403,7 @@ int nilfs_resize_fs(struct super_block *sb, __u64 newsize)
int ret; int ret;
ret = -ERANGE; ret = -ERANGE;
devsize = i_size_read(sb->s_bdev->bd_inode); devsize = bdev_nr_bytes(sb->s_bdev);
if (newsize > devsize) if (newsize > devsize)
goto out; goto out;
......
...@@ -489,7 +489,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, ...@@ -489,7 +489,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,
{ {
struct nilfs_super_block **sbp = nilfs->ns_sbp; struct nilfs_super_block **sbp = nilfs->ns_sbp;
struct buffer_head **sbh = nilfs->ns_sbh; struct buffer_head **sbh = nilfs->ns_sbh;
u64 sb2off = NILFS_SB2_OFFSET_BYTES(nilfs->ns_bdev->bd_inode->i_size); u64 sb2off = NILFS_SB2_OFFSET_BYTES(bdev_nr_bytes(nilfs->ns_bdev));
int valid[2], swp = 0; int valid[2], swp = 0;
sbp[0] = nilfs_read_super_block(sb, NILFS_SB_OFFSET_BYTES, blocksize, sbp[0] = nilfs_read_super_block(sb, NILFS_SB_OFFSET_BYTES, blocksize,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment