From def40d66aab9c67c4c4c15b234c1ff7ce5d522bf Mon Sep 17 00:00:00 2001
From: Timothy Day <timday@amazon.com>
Date: Sun, 6 Apr 2025 01:30:25 -0400
Subject: [PATCH] LU-18687 libcfs: linux-list.h is no longer needed

The linux-list.h header only includes a test for
hlist_add_after(), which is no longer called in the
code. Remove the header.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: I34a57ae0d934bccbbc91d55208fe0d57d1eb331a
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58986
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 config/lustre-libcfs.m4                  | 20 --------------------
 libcfs/include/libcfs/linux/Makefile.am  |  2 +-
 libcfs/include/libcfs/linux/linux-list.h | 12 ------------
 lustre/ptlrpc/gss/gss_keyring.c          |  2 +-
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 libcfs/include/libcfs/linux/linux-list.h

diff --git a/config/lustre-libcfs.m4 b/config/lustre-libcfs.m4
index 0306a2e..f5609a8 100644
--- a/config/lustre-libcfs.m4
+++ b/config/lustre-libcfs.m4
@@ -351,25 +351,6 @@ AC_DEFUN([LIBCFS_HAVE_GLOB],[
 ]) # LIBCFS_HAVE_GLOB
 
 #
-# Kernel version 3.17 changed hlist_add_after to
-# hlist_add_behind
-#
-AC_DEFUN([LIBCFS_SRC_HLIST_ADD_AFTER],[
-	LB2_LINUX_TEST_SRC([hlist_add_after], [
-		#include <linux/list.h>
-	],[
-		hlist_add_after(NULL, NULL);
-	])
-])
-AC_DEFUN([LIBCFS_HLIST_ADD_AFTER],[
-	LB2_MSG_LINUX_TEST_RESULT([if function 'hlist_add_after' exist],
-	[hlist_add_after], [
-		AC_DEFINE(HAVE_HLIST_ADD_AFTER, 1,
-			[hlist_add_after is available])
-	])
-]) # LIBCFS_HLIST_ADD_AFTER
-
-#
 # Kernel version 3.17 introduced struct timespec64
 #
 AC_DEFUN([LIBCFS_SRC_TIMESPEC64],[
@@ -2563,7 +2544,6 @@ AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [
 	# 3.16
 	LIBCFS_SRC_HAVE_GLOB
 	# 3.17
-	LIBCFS_SRC_HLIST_ADD_AFTER
 	LIBCFS_SRC_TIMESPEC64
 	LIBCFS_SRC_KTIME_GET_NS
 	LIBCFS_SRC_KTIME_GET_REAL_TS64
diff --git a/libcfs/include/libcfs/linux/Makefile.am b/libcfs/include/libcfs/linux/Makefile.am
index 1642f27..5d012f2 100644
--- a/libcfs/include/libcfs/linux/Makefile.am
+++ b/libcfs/include/libcfs/linux/Makefile.am
@@ -5,5 +5,5 @@
 #
 
 EXTRA_DIST = linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \
-	     linux-list.h linux-wait.h linux-net.h \
+	     linux-wait.h linux-net.h \
 	     refcount.h processor.h linux-fortify-string.h
diff --git a/libcfs/include/libcfs/linux/linux-list.h b/libcfs/include/libcfs/linux/linux-list.h
deleted file mode 100644
index 21d4900..0000000
--- a/libcfs/include/libcfs/linux/linux-list.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#ifndef __LIBCFS_LINUX_LIST_H__
-#define __LIBCFS_LINUX_LIST_H__
-
-#include <linux/list.h>
-
-#ifdef HAVE_HLIST_ADD_AFTER
-#define hlist_add_behind(hnode, tail)	hlist_add_after(tail, hnode)
-#endif /* HAVE_HLIST_ADD_AFTER */
-
-#endif /* __LIBCFS_LINUX_LIST_H__ */
diff --git a/lustre/ptlrpc/gss/gss_keyring.c b/lustre/ptlrpc/gss/gss_keyring.c
index a21527a..f1b33db 100644
--- a/lustre/ptlrpc/gss/gss_keyring.c
+++ b/lustre/ptlrpc/gss/gss_keyring.c
@@ -24,9 +24,9 @@
 #include <linux/keyctl.h>
 #include <linux/key-type.h>
 #include <linux/mutex.h>
+#include <linux/list.h>
 #include <asm/atomic.h>
 
-#include <libcfs/linux/linux-list.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
-- 
1.8.3.1