From 4ea41b3eb5fd51b47742c6fa2ac1851a51ab0c69 Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Thu, 9 Sep 2021 21:09:39 +0300

Subject: [Backport 4ea41b3eb5fd] src: Remove tmp pointer bd_inode in

 fill_super

Drop tmp pointer bd_inode because this is only used ones in fill_super.

Also we have so many initializing happening at the beginning that it is

already way too much to follow.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/super.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/super.c b/src/super.c

index 93b8a1f4d7483210eeac016f2fb8abaa7e5d8b2c..e5ec808bd0522cb986ef11cbcc3ece57f6988916 100644

--- a/src/super.c

+++ b/src/super.c

@@ -875,7 +875,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 	int err;

 	struct ntfs_sb_info *sbi = sb->s_fs_info;

 	struct block_device *bdev = sb->s_bdev;

-	struct inode *bd_inode = bdev->bd_inode;

 	struct request_queue *rq = bdev_get_queue(bdev);

 	struct inode *inode;

 	struct ntfs_inode *ni;

@@ -918,7 +917,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 	/* Parse boot. */

 	err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512,

-				  bd_inode->i_size);

+				  bdev->bd_inode->i_size);

 	if (err)

 		return err;

-- 

2.31.1