From 90ab7f8edff4ba447f84c2d0d0c35905c1c9a204 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 Mar 2024 18:02:56 +0100 Subject: [PATCH] 6.6-stable patches added patches: fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch series --- ...uild-without-config_ntfs3_lzx_xpress.patch | 46 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 queue-6.6/fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch create mode 100644 queue-6.6/series diff --git a/queue-6.6/fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch b/queue-6.6/fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch new file mode 100644 index 00000000000..5f4293d9976 --- /dev/null +++ b/queue-6.6/fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch @@ -0,0 +1,46 @@ +From c8e314624a1666ed2eec28549713021a8ec801e9 Mon Sep 17 00:00:00 2001 +From: Mark O'Donovan +Date: Wed, 21 Feb 2024 10:43:58 +0000 +Subject: fs/ntfs3: fix build without CONFIG_NTFS3_LZX_XPRESS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mark O'Donovan + +commit c8e314624a1666ed2eec28549713021a8ec801e9 upstream. + +When CONFIG_NTFS3_LZX_XPRESS is not set then we get the following build +error: + + fs/ntfs3/frecord.c:2460:16: error: unused variable ‘i_size’ + +Signed-off-by: Mark O'Donovan +Fixes: 4fd6c08a16d7 ("fs/ntfs3: Use i_size_read and i_size_write") +Tested-by: Chris Clayton +Signed-off-by: Linus Torvalds +Reported-by: Rainer Fiebig +Cc: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + fs/ntfs3/frecord.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/ntfs3/frecord.c ++++ b/fs/ntfs3/frecord.c +@@ -2457,7 +2457,6 @@ int ni_read_frame(struct ntfs_inode *ni, + struct ATTR_LIST_ENTRY *le = NULL; + struct runs_tree *run = &ni->file.run; + u64 valid_size = ni->i_valid; +- loff_t i_size = i_size_read(&ni->vfs_inode); + u64 vbo_disk; + size_t unc_size; + u32 frame_size, i, npages_disk, ondisk_size; +@@ -2509,6 +2508,7 @@ int ni_read_frame(struct ntfs_inode *ni, + err = -EOPNOTSUPP; + goto out1; + #else ++ loff_t i_size = i_size_read(&ni->vfs_inode); + u32 frame_bits = ni_ext_compress_bits(ni); + u64 frame64 = frame_vbo >> frame_bits; + u64 frames, vbo_data; diff --git a/queue-6.6/series b/queue-6.6/series new file mode 100644 index 00000000000..de254e6053e --- /dev/null +++ b/queue-6.6/series @@ -0,0 +1 @@ +fs-ntfs3-fix-build-without-config_ntfs3_lzx_xpress.patch -- 2.47.3