summaryrefslogtreecommitdiffstats
path: root/fs/ntfs3/super.c
diff options
context:
space:
mode:
authorKari Argillander <kari.argillander@gmail.com>2021-09-09 20:09:40 +0200
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2021-09-20 17:53:11 +0200
commit0056b273757b3057a5aff73f96a7fa134641caf4 (patch)
tree89a458971865a825a9727d55a143e2375f36ec31 /fs/ntfs3/super.c
parentfs/ntfs3: Remove tmp pointer bd_inode in fill_super (diff)
downloadlinux-0056b273757b3057a5aff73f96a7fa134641caf4.tar.xz
linux-0056b273757b3057a5aff73f96a7fa134641caf4.zip
fs/ntfs3: 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>
Diffstat (limited to 'fs/ntfs3/super.c')
-rw-r--r--fs/ntfs3/super.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index e5ec808bd052..8ce0d4f439a1 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/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);