aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfs_idmap.h
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-03-05 14:58:15 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-05 15:26:47 -0500
commit91e56aaedd7ebceacde782a3921fadef4b5d0e1c (patch)
treebab4aba01720a09f581c48ce3f77fa3c47863594 /include/linux/nfs_idmap.h
parentMerge commit 'nfs-for-3.3-4' into nfs-for-next (diff)
downloadlinux-dev-91e56aaedd7ebceacde782a3921fadef4b5d0e1c.tar.xz
linux-dev-91e56aaedd7ebceacde782a3921fadef4b5d0e1c.zip
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>
Diffstat (limited to 'include/linux/nfs_idmap.h')
-rw-r--r--include/linux/nfs_idmap.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 717fa5019e75..7eed2012d288 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 *);