提交 f9ebd618 编写于 作者: A Anna Schumaker 提交者: Trond Myklebust

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: NAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
上级 7c61f0d3
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <linux/lockd/bind.h> #include <linux/lockd/bind.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/nfs_idmap.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/in6.h> #include <linux/in6.h>
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/nfs_idmap.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/in6.h> #include <linux/in6.h>
......
...@@ -46,19 +46,8 @@ struct nfs_server; ...@@ -46,19 +46,8 @@ struct nfs_server;
struct nfs_fattr; struct nfs_fattr;
struct nfs4_string; struct nfs4_string;
#if IS_ENABLED(CONFIG_NFS_V4)
int nfs_idmap_init(void); int nfs_idmap_init(void);
void nfs_idmap_quit(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 *); int nfs_idmap_new(struct nfs_client *);
void nfs_idmap_delete(struct nfs_client *); void nfs_idmap_delete(struct nfs_client *);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册