From 0ec4b072e715e55e34fe7dbabbab93e69466123a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 23 Apr 2025 16:12:26 +0200 Subject: [PATCH] 5.15-stable patches added patches: f2fs-add-inline-to-f2fs_build_fault_attr-stub.patch --- ...inline-to-f2fs_build_fault_attr-stub.patch | 43 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-5.15/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 index 0000000000..23ec163a8d --- /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 +Date: Mon, 13 May 2024 08:40:27 -0700 +Subject: f2fs: Add inline to f2fs_build_fault_attr() stub + +From: Nathan Chancellor + +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 +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Greg Kroah-Hartman +--- + 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 a5029b5207..662fc8a017 100644 --- 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 -- 2.47.3