Re: [PATCH 20/30] ntfs3: use bdev_nr_bytes instead of open coding it

Kari Argillander
2021-10-16T07:40:12Z

On Fri, Oct 15, 2021 at 03:26:33PM +0200, Christoph Hellwig wrote:
> Use the proper helper to read the block device size.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/ntfs3/super.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
> index 55bbc9200a10e..7ed2cb5e8b1d9 100644
> --- a/fs/ntfs3/super.c
> +++ b/fs/ntfs3/super.c
> @@ -918,7 +918,6 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)
> int err;
> struct ntfs_sb_info *sbi;
> struct block_device *bdev = sb->s_bdev;
> - struct inode *bd_inode = bdev->bd_inode;

Linus merged latest ntfs3 stuff and this temp variable is not anymore in
upstream. So this patch will conflict. Just so that you know.

> struct request_queue *rq = bdev_get_queue(bdev);
> struct inode *inode = NULL;
> struct ntfs_inode *ni;
> @@ -967,7 +966,7 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)
>
> /* Parse boot. */
> err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512,
> - bd_inode->i_size);
> + bdev_nr_bytes(bdev));
> if (err)
> goto out;
>
> --
> 2.30.2
>
>