aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@netapp.com>2015-04-15 13:00:04 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-04-23 15:16:13 -0400
commitf9ebd61855253078fe8b07bacaf516337f8078e8 (patch)
treedc48d13b9bd445627db1b20bef63c782c53fa17c /include
parent7c61f0d3897eeeff6f3294adb9f910ddefa8035a (diff)
NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
The idmapper is completely internal to the NFS v4 module, so this macro will always evaluate to true. This patch also removes unnecessary includes of this file from the generic NFS client. Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_idmap.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 333844e38f66..daaf3ea5e9d8 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -46,19 +46,8 @@ struct nfs_server;
46struct nfs_fattr; 46struct nfs_fattr;
47struct nfs4_string; 47struct nfs4_string;
48 48
49#if IS_ENABLED(CONFIG_NFS_V4)
50int nfs_idmap_init(void); 49int nfs_idmap_init(void);
51void nfs_idmap_quit(void); 50void nfs_idmap_quit(void);
52#else
53static inline int nfs_idmap_init(void)
54{
55 return 0;
56}
57
58static inline void nfs_idmap_quit(void)
59{}
60#endif
61
62int nfs_idmap_new(struct nfs_client *); 51int nfs_idmap_new(struct nfs_client *);
63void nfs_idmap_delete(struct nfs_client *); 52void nfs_idmap_delete(struct nfs_client *);
64 53