From 50c988efc229058315810988a6a14579c52f0604 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@cse.unsw.edu.au>
Date: Thu, 23 Jun 2005 22:03:35 -0700
Subject: [PATCH] --- yaml --- r: 3111 b: refs/heads/master c:
 bd0b1e954e3ba3e5d2cab941458cf98206471bd2 h: refs/heads/master i:   3109:
 60f9d47fa2bd757584ea7d7f31864b194d43c549   3107:
 20333a6d78fa69c15adcc7717d1a1514377da4d2   3103:
 dacdf9e77b3090d5fc5fefa90e842fc9d690cd6b v: v3

---
 [refs]                           | 2 +-
 trunk/fs/nfsd/nfsctl.c           | 4 ----
 trunk/include/linux/nfsd_idmap.h | 5 +++++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a0c0f9ce1cb9..aaed4d032854 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 707d4ab7b3aa6d1f7a7d2cd123fb83ba9a528205
+refs/heads/master: bd0b1e954e3ba3e5d2cab941458cf98206471bd2
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 3d56531a7a03..3da43a3ed32c 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -398,9 +398,7 @@ static int __init init_nfsd(void)
 	nfsd_export_init();	/* Exports table */
 	nfsd_lockd_init();	/* lockd->nfsd callbacks */
 	nfs4_state_init();	/* NFSv4 locking state */
-#ifdef CONFIG_NFSD_V4
 	nfsd_idmap_init();      /* Name to ID mapping */
-#endif /* CONFIG_NFSD_V4 */
 	if (proc_mkdir("fs/nfs", NULL)) {
 		struct proc_dir_entry *entry;
 		entry = create_proc_entry("fs/nfs/exports", 0, NULL);
@@ -427,9 +425,7 @@ static void __exit exit_nfsd(void)
 	remove_proc_entry("fs/nfs", NULL);
 	nfsd_stat_shutdown();
 	nfsd_lockd_shutdown();
-#ifdef CONFIG_NFSD_V4
 	nfsd_idmap_shutdown();
-#endif /* CONFIG_NFSD_V4 */
 	unregister_filesystem(&nfsd_fs_type);
 }
 
diff --git a/trunk/include/linux/nfsd_idmap.h b/trunk/include/linux/nfsd_idmap.h
index 9bb7f30e923b..e82746fcad14 100644
--- a/trunk/include/linux/nfsd_idmap.h
+++ b/trunk/include/linux/nfsd_idmap.h
@@ -43,8 +43,13 @@
 /* XXX from linux/nfs_idmap.h */
 #define IDMAP_NAMESZ 128
 
+#ifdef CONFIG_NFSD_V4
 void nfsd_idmap_init(void);
 void nfsd_idmap_shutdown(void);
+#else
+static inline void nfsd_idmap_init(void) {};
+static inline void nfsd_idmap_shutdown(void) {};
+#endif
 
 int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);
 int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);