aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-11-08 16:09:59 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:04 -0500
commitdf95a9d4fb91d819d3fb55dd437056df59e7f15e (patch)
tree9c35b2617a202c029803791c19d55a0483d9d225 /fs
parentd5c3428b2cb26d605fddc4878f4fcc03c23df89f (diff)
knfsd: cache unregistration needn't return error
There's really nothing much the caller can do if cache unregistration fails. And indeed, all any caller does in this case is print an error and continue. So just return void and move the printk's inside cache_unregister. Acked-by: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/export.c6
-rw-r--r--fs/nfsd/nfs4idmap.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 66d0aeb32a47..d29b70a28f2b 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1670,10 +1670,8 @@ nfsd_export_shutdown(void)
1670 1670
1671 exp_writelock(); 1671 exp_writelock();
1672 1672
1673 if (cache_unregister(&svc_expkey_cache)) 1673 cache_unregister(&svc_expkey_cache);
1674 printk(KERN_ERR "nfsd: failed to unregister expkey cache\n"); 1674 cache_unregister(&svc_export_cache);
1675 if (cache_unregister(&svc_export_cache))
1676 printk(KERN_ERR "nfsd: failed to unregister export cache\n");
1677 svcauth_unix_purge(); 1675 svcauth_unix_purge();
1678 1676
1679 exp_writeunlock(); 1677 exp_writeunlock();
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 5b56c77c15c5..ef22179c49ad 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -474,10 +474,8 @@ nfsd_idmap_init(void)
474void 474void
475nfsd_idmap_shutdown(void) 475nfsd_idmap_shutdown(void)
476{ 476{
477 if (cache_unregister(&idtoname_cache)) 477 cache_unregister(&idtoname_cache);
478 printk(KERN_ERR "nfsd: failed to unregister idtoname cache\n"); 478 cache_unregister(&nametoid_cache);
479 if (cache_unregister(&nametoid_cache))
480 printk(KERN_ERR "nfsd: failed to unregister nametoid cache\n");
481} 479}
482 480
483/* 481/*