From 4b4b2817ed5f2217dfd83a8e3c0af625f6882eb3 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Fri, 9 Nov 2007 12:31:55 -0500
Subject: [PATCH] --- yaml --- r: 82417 b: refs/heads/master c:
 46b25895767c606c630a97b03a895934a7a36a70 h: refs/heads/master i:   82415:
 55b2f4154119440a3d117c45ebdd1d136f075cf7 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/nfsctl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b3e66157e138..cf14f7418937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca2a05aa7c72309ee65164c78fa2be7a5038215e
+refs/heads/master: 46b25895767c606c630a97b03a895934a7a36a70
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 77dc9893b7ba..d8d50a773a5b 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -695,12 +695,14 @@ static int __init init_nfsd(void)
 	}
 	retval = register_filesystem(&nfsd_fs_type);
 	if (retval) {
+		nfsd_idmap_shutdown();
 		nfsd_export_shutdown();
 		nfsd_cache_shutdown();
 		remove_proc_entry("fs/nfs/exports", NULL);
 		remove_proc_entry("fs/nfs", NULL);
 		nfsd_stat_shutdown();
 		nfsd_lockd_shutdown();
+		nfsd4_free_slabs();
 	}
 	return retval;
 }