aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsctl.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@cse.unsw.edu.au>2005-06-24 01:03:35 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:32 -0400
commitbd0b1e954e3ba3e5d2cab941458cf98206471bd2 (patch)
tree3637bcc40dc0725becc5e47dc51a4ded1bf3f673 /fs/nfsd/nfsctl.c
parent707d4ab7b3aa6d1f7a7d2cd123fb83ba9a528205 (diff)
[PATCH] knfsd: nfsd4: idmap initialization
Adopt standard kernel style by defining a no-op function instead of putting ifdef's in the code where the function is called. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
-rw-r--r--fs/nfsd/nfsctl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 3d56531a7a03..3da43a3ed32c 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -398,9 +398,7 @@ static int __init init_nfsd(void)
398 nfsd_export_init(); /* Exports table */ 398 nfsd_export_init(); /* Exports table */
399 nfsd_lockd_init(); /* lockd->nfsd callbacks */ 399 nfsd_lockd_init(); /* lockd->nfsd callbacks */
400 nfs4_state_init(); /* NFSv4 locking state */ 400 nfs4_state_init(); /* NFSv4 locking state */
401#ifdef CONFIG_NFSD_V4
402 nfsd_idmap_init(); /* Name to ID mapping */ 401 nfsd_idmap_init(); /* Name to ID mapping */
403#endif /* CONFIG_NFSD_V4 */
404 if (proc_mkdir("fs/nfs", NULL)) { 402 if (proc_mkdir("fs/nfs", NULL)) {
405 struct proc_dir_entry *entry; 403 struct proc_dir_entry *entry;
406 entry = create_proc_entry("fs/nfs/exports", 0, NULL); 404 entry = create_proc_entry("fs/nfs/exports", 0, NULL);
@@ -427,9 +425,7 @@ static void __exit exit_nfsd(void)
427 remove_proc_entry("fs/nfs", NULL); 425 remove_proc_entry("fs/nfs", NULL);
428 nfsd_stat_shutdown(); 426 nfsd_stat_shutdown();
429 nfsd_lockd_shutdown(); 427 nfsd_lockd_shutdown();
430#ifdef CONFIG_NFSD_V4
431 nfsd_idmap_shutdown(); 428 nfsd_idmap_shutdown();
432#endif /* CONFIG_NFSD_V4 */
433 unregister_filesystem(&nfsd_fs_type); 429 unregister_filesystem(&nfsd_fs_type);
434} 430}
435 431