Commit ab700417 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

ntfs: use sb_bdev_nr_blocks

Use the sb_bdev_nr_blocks helper instead of open coding it and clean up
ntfs_fill_super a bit by moving an assignment a little earlier that has
no negative side effects.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarAnton Altaparmakov <anton@tuxera.com>
Link: https://lore.kernel.org/r/20211018101130.1838532-29-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dd0c0bdf
...@@ -2772,13 +2772,12 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -2772,13 +2772,12 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
ntfs_debug("Set device block size to %i bytes (block size bits %i).", ntfs_debug("Set device block size to %i bytes (block size bits %i).",
blocksize, sb->s_blocksize_bits); blocksize, sb->s_blocksize_bits);
/* Determine the size of the device in units of block_size bytes. */ /* Determine the size of the device in units of block_size bytes. */
if (!i_size_read(sb->s_bdev->bd_inode)) { vol->nr_blocks = sb_bdev_nr_blocks(sb);
if (!vol->nr_blocks) {
if (!silent) if (!silent)
ntfs_error(sb, "Unable to determine device size."); ntfs_error(sb, "Unable to determine device size.");
goto err_out_now; goto err_out_now;
} }
vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >>
sb->s_blocksize_bits;
/* Read the boot sector and return unlocked buffer head to it. */ /* Read the boot sector and return unlocked buffer head to it. */
if (!(bh = read_ntfs_boot_sector(sb, silent))) { if (!(bh = read_ntfs_boot_sector(sb, silent))) {
if (!silent) if (!silent)
...@@ -2816,8 +2815,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -2816,8 +2815,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
goto err_out_now; goto err_out_now;
} }
BUG_ON(blocksize != sb->s_blocksize); BUG_ON(blocksize != sb->s_blocksize);
vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> vol->nr_blocks = sb_bdev_nr_blocks(sb);
sb->s_blocksize_bits;
ntfs_debug("Changed device block size to %i bytes (block size " ntfs_debug("Changed device block size to %i bytes (block size "
"bits %i) to match volume sector size.", "bits %i) to match volume sector size.",
blocksize, sb->s_blocksize_bits); blocksize, sb->s_blocksize_bits);
......
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