From 80a4a87480a8533d044015d505a6782f82f0c54a Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: May 17 2023 19:15:58 +0000
Subject: fs/ntfs3: Refactoring of various minor issues (bsc#1012628).


---

diff --git a/patches.kernel.org/6.3.3-211-fs-ntfs3-Refactoring-of-various-minor-issues.patch b/patches.kernel.org/6.3.3-211-fs-ntfs3-Refactoring-of-various-minor-issues.patch
new file mode 100644
index 0000000..596cdc5
--- /dev/null
+++ b/patches.kernel.org/6.3.3-211-fs-ntfs3-Refactoring-of-various-minor-issues.patch
@@ -0,0 +1,99 @@
+From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
+Date: Fri, 30 Dec 2022 14:58:25 +0400
+Subject: [PATCH] fs/ntfs3: Refactoring of various minor issues
+References: bsc#1012628
+Patch-mainline: 6.3.3
+Git-commit: 6827d50b2c430c329af442b64c9176d174f56521
+
+commit 6827d50b2c430c329af442b64c9176d174f56521 upstream.
+
+Removed unused macro.
+Changed null pointer checking.
+Fixed inconsistent indenting.
+
+Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
+Cc: Rudi Heitbaum <rudi@heitbaum.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ 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 723fb64e..393c726e 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 f1df52df..7d0473da 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 56756377..24c9aeb5 100644
+--- a/fs/ntfs3/fsntfs.c
++++ b/fs/ntfs3/fsntfs.c
+@@ -2594,8 +2594,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 8d206770..92bbc8ee 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 86ea1826..90151e56 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.35.3
+
diff --git a/series.conf b/series.conf
index ae7905f..7fdb5f1 100644
--- a/series.conf
+++ b/series.conf
@@ -944,6 +944,7 @@
 	patches.kernel.org/6.3.3-208-firewire-net-fix-unexpected-release-of-object-f.patch
 	patches.kernel.org/6.3.3-209-HID-wacom-Set-a-default-resolution-for-older-ta.patch
 	patches.kernel.org/6.3.3-210-HID-wacom-insert-timestamp-to-packed-Bluetooth-.patch
+	patches.kernel.org/6.3.3-211-fs-ntfs3-Refactoring-of-various-minor-issues.patch
 
 	########################################################
 	# Build fixes that apply to the vanilla kernel too.