5.15-stable patches

added patches:
	f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch

diff --git a/queue-5.15/f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch b/queue-5.15/f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch
new file mode 100644 (file)
index 0000000..23ec163
--- /dev/null
+++ b/queue-5.15/f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch
@@ -0,0 +1,43 @@
+From 0d8968287a1cf7b03d07387dc871de3861b9f6b9 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 13 May 2024 08:40:27 -0700
+Subject: f2fs: Add inline to f2fs_build_fault_attr() stub
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit 0d8968287a1cf7b03d07387dc871de3861b9f6b9 upstream.
+
+When building without CONFIG_F2FS_FAULT_INJECTION, there is a warning
+from each file that includes f2fs.h because the stub for
+f2fs_build_fault_attr() is missing inline:
+
+  In file included from fs/f2fs/segment.c:21:
+  fs/f2fs/f2fs.h:4605:12: warning: 'f2fs_build_fault_attr' defined but not used [-Wunused-function]
+   4605 | static int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
+        |            ^~~~~~~~~~~~~~~~~~~~~
+
+Add the missing inline to resolve all of the warnings for this
+configuration.
+
+Fixes: 4ed886b187f4 ("f2fs: check validation of fault attrs in f2fs_build_fault_attr()")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Reviewed-by: Chao Yu <chao@kernel.org>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/f2fs/f2fs.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/f2fs/f2fs.h
++++ b/fs/f2fs/f2fs.h
+@@ -4376,8 +4376,8 @@ static inline bool f2fs_need_verity(cons
+ extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
+                                                       unsigned long type);
+ #else
+-static int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate,
+-                                                      unsigned long type)
++static inline int f2fs_build_fault_attr(struct f2fs_sb_info *sbi,
++                                      unsigned long rate, unsigned long type)
+ {
+       return 0;
+ }

diff --git a/queue-5.15/series b/queue-5.15/series
index a5029b5207c98b129993682dab33b2c74829fc84..662fc8a0173ba49cb67be741371c759ab3a9e474 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -251,3 +251,4 @@ f2fs-check-validation-of-fault-attrs-in-f2fs_build_fault_attr.patch
 pmdomain-ti-add-a-null-pointer-check-to-the-omap_prm_domain_init.patch
 net-sched-act_mirred-don-t-override-retval-if-we-already-lost-the-skb.patch
 scsi-lpfc-fix-null-pointer-dereference-after-failing-to-issue-flogi-and-plogi.patch
+f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch