2 files changed, 9 insertions, 2 deletions

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 9a11aa39e2e4..057aff745506 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -26,6 +26,7 @@
 #include <linux/namei.h>
 #include <linux/mount.h>
 #include <linux/hash.h>
+#include <linux/module.h>
 
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
@@ -221,6 +222,7 @@ static int expkey_show(struct seq_file *m,
 }
         
 struct cache_detail svc_expkey_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = EXPKEY_HASHMAX,
         .hash_table     = expkey_table,
         .name           = "nfsd.fh",
@@ -456,6 +458,7 @@ static int svc_export_show(struct seq_file *m,
         return 0;
 }
 struct cache_detail svc_export_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = EXPORT_HASHMAX,
         .hash_table     = export_table,
         .name           = "nfsd.export",
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 5605a26efc57..13369650cdf9 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -187,6 +187,7 @@ static int         idtoname_parse(struct cache_detail *, char *, int);
 static struct ent *idtoname_lookup(struct ent *, int);
 
 static struct cache_detail idtoname_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = ENT_HASHMAX,
         .hash_table     = idtoname_table,
         .name           = "nfs4.idtoname",
@@ -320,6 +321,7 @@ static struct ent *nametoid_lookup(struct ent *, int);
 static int         nametoid_parse(struct cache_detail *, char *, int);
 
 static struct cache_detail nametoid_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = ENT_HASHMAX,
         .hash_table     = nametoid_table,
         .name           = "nfs4.nametoid",
@@ -404,8 +406,10 @@ nfsd_idmap_init(void)
 void
 nfsd_idmap_shutdown(void)
 {
-        cache_unregister(&idtoname_cache);
-        cache_unregister(&nametoid_cache);
+        if (cache_unregister(&idtoname_cache))
+                printk(KERN_ERR "nfsd: failed to unregister idtoname cache\n");
+        if (cache_unregister(&nametoid_cache))
+                printk(KERN_ERR "nfsd: failed to unregister nametoid cache\n");
 }
 
 /*