From: Kari Argillander <kari.argillander@gmail.com>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
ntfs3@lists.linux.dev
Cc: Kari Argillander <kari.argillander@gmail.com>,
linux-kernel@vger.kernel.org,
Christian Brauner <christian.brauner@ubuntu.com>
Subject: [PATCH 09/11] fs/ntfs3: Remove tmp pointer upcase in fill_super
Date: Thu, 9 Sep 2021 21:09:40 +0300 [thread overview]
Message-ID: <20210909180942.8634-10-kari.argillander@gmail.com> (raw)
In-Reply-To: <20210909180942.8634-1-kari.argillander@gmail.com>
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>
---
fs/ntfs3/super.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 14cb90a4c133..9a096be32fb2 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -886,7 +886,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;
@@ -1186,11 +1185,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)) {
@@ -1209,10 +1206,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.25.1
next prev parent reply other threads:[~2021-09-09 18:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 18:09 [PATCH 00/11] fs/ntfs3: Refactor fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 01/11] fs/ntfs3: Fix wrong error message $Logfile -> $UpCase Kari Argillander
2021-09-09 18:09 ` [PATCH 02/11] fs/ntfs3: Change EINVAL to ENOMEM when d_make_root fails Kari Argillander
2021-09-09 18:09 ` [PATCH 03/11] fs/ntfs3: Remove impossible fault condition in fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 04/11] fs/ntfs3: Return straight without goto " Kari Argillander
2021-09-09 18:09 ` [PATCH 05/11] fs/ntfs3: Remove unnecessary variable loading " Kari Argillander
2021-09-09 18:09 ` [PATCH 06/11] fs/ntfs3: Use sb instead of sbi->sb " Kari Argillander
2021-09-09 18:09 ` [PATCH 07/11] fs/ntfs3: Remove tmp var is_ro in ntfs_fill_super Kari Argillander
2021-09-09 18:09 ` [PATCH 08/11] fs/ntfs3: Remove tmp pointer bd_inode in fill_super Kari Argillander
2021-09-09 18:09 ` Kari Argillander [this message]
2021-09-09 18:09 ` [PATCH 10/11] fs/ntfs3: Initialize pointer before use place " Kari Argillander
2021-09-09 18:09 ` [PATCH 11/11] fs/ntfs3: Initiliaze sb blocksize only in one place + refactor Kari Argillander
2021-09-20 16:07 ` [PATCH 00/11] fs/ntfs3: Refactor fill_super Konstantin Komarov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210909180942.8634-10-kari.argillander@gmail.com \
--to=kari.argillander@gmail.com \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=christian.brauner@ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).