From 0056b273757b3057a5aff73f96a7fa134641caf4 Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 0056b273757b] src: Remove tmp pointer upcase in

 fill_super

We can survive without this tmp point upcase. So remove it we don't have

so many tmp pointer in this function.

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

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

---

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

 1 file changed, 4 insertions(+), 7 deletions(-)

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

index e5ec808bd0522cb986ef11cbcc3ece57f6988916..8ce0d4f439a1e26b9f12dbdab0fbb946da859adb 100644

--- a/src/super.c

+++ b/src/super.c

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

 	const struct VOLUME_INFO *info;

 	u32 idx, done, bytes;

 	struct ATTR_DEF_ENTRY *t;

-	u16 *upcase;

 	u16 *shared;

 	struct MFT_REF ref;

@@ -1184,11 +1183,9 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		goto out;

 	}

-	upcase = sbi->upcase;

-

 	for (idx = 0; idx < (0x10000 * sizeof(short) >> PAGE_SHIFT); idx++) {

 		const __le16 *src;

-		u16 *dst = Add2Ptr(upcase, idx << PAGE_SHIFT);

+		u16 *dst = Add2Ptr(sbi->upcase, idx << PAGE_SHIFT);

 		struct page *page = ntfs_map_page(inode->i_mapping, idx);

 		if (IS_ERR(page)) {

@@ -1207,10 +1204,10 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)

 		ntfs_unmap_page(page);

 	}

-	shared = ntfs_set_shared(upcase, 0x10000 * sizeof(short));

-	if (shared && upcase != shared) {

+	shared = ntfs_set_shared(sbi->upcase, 0x10000 * sizeof(short));

+	if (shared && sbi->upcase != shared) {

+		kvfree(sbi->upcase);

 		sbi->upcase = shared;

-		kvfree(upcase);

 	}

 	iput(inode);

-- 

2.31.1