Merge tag 'nfsd-6.2-6' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

torvalds · torvalds · commit 3402351a5a8f · 2023-02-15T11:48:56.000-08:00
Pull nfsd fix from Chuck Lever:

 - Fix a teardown bug in the new nfs4_file hashtable

* tag 'nfsd-6.2-6' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: don't destroy global nfs4_file table in per-net shutdown
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
@@ -8182,7 +8182,6 @@ nfs4_state_shutdown_net(struct net *net)
 
 	nfsd4_client_tracking_exit(net);
 	nfs4_state_destroy_net(net);
-	rhltable_destroy(&nfs4_file_rhltable);
 #ifdef CONFIG_NFSD_V4_2_INTER_SSC
 	nfsd4_ssc_shutdown_umount(nn);
 #endif
@@ -8192,6 +8191,7 @@ void
 nfs4_state_shutdown(void)
 {
 	nfsd4_destroy_callback_queue();
+	rhltable_destroy(&nfs4_file_rhltable);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -8182,7 +8182,6 @@ nfs4_state_shutdown_net(struct net *net)`
`8182`	`8182`
`8183`	`8183`	`nfsd4_client_tracking_exit(net);`
`8184`	`8184`	`nfs4_state_destroy_net(net);`
`8185`		`- rhltable_destroy(&nfs4_file_rhltable);`
`8186`	`8185`	`#ifdef CONFIG_NFSD_V4_2_INTER_SSC`
`8187`	`8186`	`nfsd4_ssc_shutdown_umount(nn);`
`8188`	`8187`	`#endif`
`@@ -8192,6 +8191,7 @@ void`
`8192`	`8191`	`nfs4_state_shutdown(void)`
`8193`	`8192`	`{`
`8194`	`8193`	`nfsd4_destroy_callback_queue();`
	`8194`	`+ rhltable_destroy(&nfs4_file_rhltable);`
`8195`	`8195`	`}`
`8196`	`8196`
`8197`	`8197`	`static void`