From: Bryan Schumaker <bjschuma@netapp.com>
Date: Mon, 5 Mar 2012 19:58:15 +0000 (-0500)
Subject: NFS: Undo changes to idmap.h
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91e56aaedd7ebceacde782a3921fadef4b5d0e1c;p=mv-sheeva.git

NFS: Undo changes to idmap.h

When compiled without NFS v4 configured these function won't be defined
and the compiler will yell.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 717fa5019e7..7eed2012d28 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -69,8 +69,19 @@ struct nfs_server;
 struct nfs_fattr;
 struct nfs4_string;
 
+#ifdef CONFIG_NFS_V4
 int nfs_idmap_init(void);
 void nfs_idmap_quit(void);
+#else
+static inline int nfs_idmap_init(void)
+{
+	return 0;
+}
+
+static inline void nfs_idmap_quit(void)
+{}
+#endif
+
 int nfs_idmap_new(struct nfs_client *);
 void nfs_idmap_delete(struct nfs_client *);