2012-03-05 19:58:32

by Anna Schumaker

[permalink] [raw]
Subject: [PATCH] NFS: Undo changes to idmap.h

From: Bryan Schumaker <[email protected]>

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

Signed-off-by: Bryan Schumaker <[email protected]>
---
include/linux/nfs_idmap.h | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 717fa50..7eed201 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 *);

--
1.7.9.2