linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
To: <ntfs3@lists.linux.dev>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 5/5] fs/ntfs3: Refactoring of various minor issues
Date: Fri, 30 Dec 2022 15:27:01 +0400	[thread overview]
Message-ID: <ee705b24-865b-26ff-157d-4cb2a303a962@paragon-software.com> (raw)
In-Reply-To: <b06828df-f9b9-1c5d-d6db-05839bad7016@paragon-software.com>

Removed unused macro.
Changed null pointer checking.
Fixed inconsistent indenting.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
---
  fs/ntfs3/bitmap.c  | 3 ++-
  fs/ntfs3/frecord.c | 2 +-
  fs/ntfs3/fsntfs.c  | 6 ++++--
  fs/ntfs3/namei.c   | 2 +-
  fs/ntfs3/ntfs.h    | 3 ---
  5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
index 723fb64e6531..393c726ef17a 100644
--- a/fs/ntfs3/bitmap.c
+++ b/fs/ntfs3/bitmap.c
@@ -658,7 +658,8 @@ int wnd_init(struct wnd_bitmap *wnd, struct 
super_block *sb, size_t nbits)
      if (!wnd->bits_last)
          wnd->bits_last = wbits;

-    wnd->free_bits = kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS | 
__GFP_NOWARN);
+    wnd->free_bits =
+        kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS | __GFP_NOWARN);
      if (!wnd->free_bits)
          return -ENOMEM;

diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 912eeb3d3471..1103d4d9a497 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -1645,7 +1645,7 @@ struct ATTR_FILE_NAME *ni_fname_name(struct 
ntfs_inode *ni,
  {
      struct ATTRIB *attr = NULL;
      struct ATTR_FILE_NAME *fname;
-       struct le_str *fns;
+    struct le_str *fns;

      if (le)
          *le = NULL;
diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index 1f36e89dcff7..342938704cfd 100644
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -2599,8 +2599,10 @@ static inline bool is_reserved_name(struct 
ntfs_sb_info *sbi,
      if (len == 4 || (len > 4 && le16_to_cpu(name[4]) == '.')) {
          port_digit = le16_to_cpu(name[3]);
          if (port_digit >= '1' && port_digit <= '9')
-            if (!ntfs_cmp_names(name, 3, COM_NAME, 3, upcase, false) ||
-                !ntfs_cmp_names(name, 3, LPT_NAME, 3, upcase, false))
+            if (!ntfs_cmp_names(name, 3, COM_NAME, 3, upcase,
+                        false) ||
+                !ntfs_cmp_names(name, 3, LPT_NAME, 3, upcase,
+                        false))
                  return true;
      }

diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index 3db34d5c03dc..53ddea219e37 100644
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -93,7 +93,7 @@ static struct dentry *ntfs_lookup(struct inode *dir, 
struct dentry *dentry,
       * If the MFT record of ntfs inode is not a base record, 
inode->i_op can be NULL.
       * This causes null pointer dereference in d_splice_alias().
       */
-    if (!IS_ERR(inode) && inode->i_op == NULL) {
+    if (!IS_ERR_OR_NULL(inode) && !inode->i_op) {
          iput(inode);
          inode = ERR_PTR(-EINVAL);
      }
diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index 86ea1826d099..90151e56c122 100644
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -435,9 +435,6 @@ static inline u64 attr_svcn(const struct ATTRIB *attr)
      return attr->non_res ? le64_to_cpu(attr->nres.svcn) : 0;
  }

-/* The size of resident attribute by its resident size. */
-#define BYTES_PER_RESIDENT(b) (0x18 + (b))
-
  static_assert(sizeof(struct ATTRIB) == 0x48);
  static_assert(sizeof(((struct ATTRIB *)NULL)->res) == 0x08);
  static_assert(sizeof(((struct ATTRIB *)NULL)->nres) == 0x38);
-- 
2.34.1


      parent reply	other threads:[~2022-12-30 11:27 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-30 11:23 [PATCH 0/5] fs/ntfs3: Refactoring and bugfix Konstantin Komarov
2022-12-30 11:23 ` [PATCH 1/5] fs/ntfs3: Add null pointer checks Konstantin Komarov
2022-12-30 11:25 ` [PATCH 2/5] fs/ntfs3: Improved checking of attribute's name length Konstantin Komarov
2022-12-30 11:25 ` [PATCH 3/5] fs/ntfs3: Check for extremely large size of $AttrDef Konstantin Komarov
2022-12-30 11:26 ` [PATCH 4/5] fs/ntfs3: Restore overflow checking for attr size in mi_enum_attr Konstantin Komarov
2022-12-30 11:27 ` Konstantin Komarov [this message]

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=ee705b24-865b-26ff-157d-4cb2a303a962@paragon-software.com \
    --to=almaz.alexandrovich@paragon-software.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --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).