Commit 3402351a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents ca5ca227 4102db17

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -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