From 10b4f12c7028399007aaebc25810b18d8f7731a7 Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 10b4f12c7028] src: Remove unnecessary variable loading

 in fill_super

Remove some unnecessary variable loading. These look like copy paste

work and they are not used to anything.

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

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

---

 src/super.c | 12 +-----------

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

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

index 31a9a0d16261d77ef50a1291fc5e8710c80b7864..4ff61534682cd903bcea5f8c73567f10006e3a4d 100644

--- a/src/super.c

+++ b/src/super.c

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

 	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 = NULL;

+	struct inode *inode;

 	struct ntfs_inode *ni;

 	size_t i, tt;

 	CLST vcn, lcn, len;

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

 	sbi->volume.major_ver = info->major_ver;

 	sbi->volume.minor_ver = info->minor_ver;

 	sbi->volume.flags = info->flags;

-

 	sbi->volume.ni = ni;

-	inode = NULL;

 	/* Load $MFTMirr to estimate recs_mirr. */

 	ref.low = cpu_to_le32(MFT_REC_MIRR);

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

 		goto out;

 	iput(inode);

-	inode = NULL;

 	is_ro = sb_rdonly(sbi->sb);

@@ -1088,8 +1085,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		return PTR_ERR(inode);

 	}

-	ni = ntfs_i(inode);

-

 #ifndef CONFIG_NTFS3_64BIT_CLUSTER

 	if (inode->i_size >> 32) {

 		err = -EINVAL;

@@ -1188,8 +1183,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		return PTR_ERR(inode);

 	}

-	ni = ntfs_i(inode);

-

 	if (inode->i_size != 0x10000 * sizeof(short)) {

 		err = -EINVAL;

 		goto out;

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

 	}

 	iput(inode);

-	inode = NULL;

 	if (is_ntfs3(sbi)) {

 		/* Load $Secure. */

@@ -1259,8 +1251,6 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		return PTR_ERR(inode);

 	}

-	ni = ntfs_i(inode);

-

 	sb->s_root = d_make_root(inode);

 	if (!sb->s_root)

 		return -ENOMEM;

-- 

2.31.1