From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 Apr 2025 08:57:58 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v6.1.135~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c384b7e5bbdc7a623810d7630a3b2153143bb417;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	nvmet-fc-remove-unused-functions.patch
---

diff --git a/queue-5.4/nvmet-fc-remove-unused-functions.patch b/queue-5.4/nvmet-fc-remove-unused-functions.patch
new file mode 100644
index 0000000000..26845276d6
--- /dev/null
+++ b/queue-5.4/nvmet-fc-remove-unused-functions.patch
@@ -0,0 +1,64 @@
+From 1b304c006b0fb4f0517a8c4ba8c46e88f48a069c Mon Sep 17 00:00:00 2001
+From: WangYuli <wangyuli@uniontech.com>
+Date: Wed, 12 Mar 2025 13:06:50 +0800
+Subject: nvmet-fc: Remove unused functions
+
+From: WangYuli <wangyuli@uniontech.com>
+
+commit 1b304c006b0fb4f0517a8c4ba8c46e88f48a069c upstream.
+
+The functions nvmet_fc_iodnum() and nvmet_fc_fodnum() are currently
+unutilized.
+
+Following commit c53432030d86 ("nvme-fabrics: Add target support for FC
+transport"), which introduced these two functions, they have not been
+used at all in practice.
+
+Remove them to resolve the compiler warnings.
+
+Fix follow errors with clang-19 when W=1e:
+  drivers/nvme/target/fc.c:177:1: error: unused function 'nvmet_fc_iodnum' [-Werror,-Wunused-function]
+    177 | nvmet_fc_iodnum(struct nvmet_fc_ls_iod *iodptr)
+        | ^~~~~~~~~~~~~~~
+  drivers/nvme/target/fc.c:183:1: error: unused function 'nvmet_fc_fodnum' [-Werror,-Wunused-function]
+    183 | nvmet_fc_fodnum(struct nvmet_fc_fcp_iod *fodptr)
+        | ^~~~~~~~~~~~~~~
+  2 errors generated.
+  make[8]: *** [scripts/Makefile.build:207: drivers/nvme/target/fc.o] Error 1
+  make[7]: *** [scripts/Makefile.build:465: drivers/nvme/target] Error 2
+  make[6]: *** [scripts/Makefile.build:465: drivers/nvme] Error 2
+  make[6]: *** Waiting for unfinished jobs....
+
+Fixes: c53432030d86 ("nvme-fabrics: Add target support for FC transport")
+Signed-off-by: WangYuli <wangyuli@uniontech.com>
+Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nvme/target/fc.c |   14 --------------
+ 1 file changed, 14 deletions(-)
+
+--- a/drivers/nvme/target/fc.c
++++ b/drivers/nvme/target/fc.c
+@@ -146,20 +146,6 @@ struct nvmet_fc_tgt_assoc {
+ 	struct work_struct		del_work;
+ };
+ 
+-
+-static inline int
+-nvmet_fc_iodnum(struct nvmet_fc_ls_iod *iodptr)
+-{
+-	return (iodptr - iodptr->tgtport->iod);
+-}
+-
+-static inline int
+-nvmet_fc_fodnum(struct nvmet_fc_fcp_iod *fodptr)
+-{
+-	return (fodptr - fodptr->queue->fod);
+-}
+-
+-
+ /*
+  * Association and Connection IDs:
+  *
diff --git a/queue-5.4/series b/queue-5.4/series
index 8ad521b616..12aa99513c 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -115,3 +115,4 @@ misc-pci_endpoint_test-avoid-issue-of-interrupts-remaining-after-request_irq-err
 misc-pci_endpoint_test-fix-irq_type-to-convey-the-correct-type.patch
 usb-dwc3-support-continuous-runtime-pm-with-dual-role.patch
 usb-dwc3-core-do-core-softreset-when-switch-mode.patch
+nvmet-fc-remove-unused-functions.patch