From c695ac2d60f495a50aa2aceb4fdeb587e1008f65 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <anna.schumaker@oracle.com>
Date: Fri, 14 Nov 2025 14:48:36 -0500
Subject: [PATCH] NFS: Move nfs40_shutdown_client into nfs40client.c

Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
---
 fs/nfs/nfs40.h       | 3 +++
 fs/nfs/nfs40client.c | 9 +++++++++
 fs/nfs/nfs40proc.c   | 1 +
 fs/nfs/nfs4_fs.h     | 1 -
 fs/nfs/nfs4client.c  | 8 --------
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/nfs40.h b/fs/nfs/nfs40.h
index 272e1ffdb1615..9369bb08825a8 100644
--- a/fs/nfs/nfs40.h
+++ b/fs/nfs/nfs40.h
@@ -3,6 +3,9 @@
 #define __LINUX_FS_NFS_NFS4_0_H
 
 
+/* nfs40client.c */
+void nfs40_shutdown_client(struct nfs_client *);
+
 /* nfs40proc.c */
 extern const struct nfs4_minor_version_ops nfs_v4_0_minor_ops;
 
diff --git a/fs/nfs/nfs40client.c b/fs/nfs/nfs40client.c
index fae4ff584b1bb..4a19ad9df7890 100644
--- a/fs/nfs/nfs40client.c
+++ b/fs/nfs/nfs40client.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/nfs_fs.h>
 #include "nfs4_fs.h"
+#include "nfs4session.h"
 #include "callback.h"
 #include "internal.h"
 #include "netns.h"
@@ -44,6 +45,14 @@ static bool nfs4_same_verifier(nfs4_verifier *v1, nfs4_verifier *v2)
 	return memcmp(v1->data, v2->data, sizeof(v1->data)) == 0;
 }
 
+void nfs40_shutdown_client(struct nfs_client *clp)
+{
+	if (clp->cl_slot_tbl) {
+		nfs4_shutdown_slot_table(clp->cl_slot_tbl);
+		kfree(clp->cl_slot_tbl);
+	}
+}
+
 /**
  * nfs40_walk_client_list - Find server that recognizes a client ID
  *
diff --git a/fs/nfs/nfs40proc.c b/fs/nfs/nfs40proc.c
index 5968a3318d14f..0399e2e68c6b8 100644
--- a/fs/nfs/nfs40proc.c
+++ b/fs/nfs/nfs40proc.c
@@ -5,6 +5,7 @@
 #include <linux/nfs_fs.h>
 #include "internal.h"
 #include "nfs4_fs.h"
+#include "nfs40.h"
 #include "nfs4trace.h"
 
 static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 18f04906c5fa1..3a81a658e5d20 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -482,7 +482,6 @@ extern const u32 nfs4_pathconf_bitmap[3];
 extern const u32 nfs4_fsinfo_bitmap[3];
 extern const u32 nfs4_fs_locations_bitmap[3];
 
-void nfs40_shutdown_client(struct nfs_client *);
 void nfs41_shutdown_client(struct nfs_client *);
 int nfs40_init_client(struct nfs_client *);
 int nfs41_init_client(struct nfs_client *);
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 517cf8af29431..d83a8a2a3c707 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -189,14 +189,6 @@ void nfs41_shutdown_client(struct nfs_client *clp)
 }
 #endif	/* CONFIG_NFS_V4_1 */
 
-void nfs40_shutdown_client(struct nfs_client *clp)
-{
-	if (clp->cl_slot_tbl) {
-		nfs4_shutdown_slot_table(clp->cl_slot_tbl);
-		kfree(clp->cl_slot_tbl);
-	}
-}
-
 struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
 {
 	char buf[INET6_ADDRSTRLEN + 1];
-- 
2.47.3