summaryrefslogtreecommitdiffstats
path: root/fs/nfs
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 /fs/nfs
parent7c61f0d3897eeeff6f3294adb9f910ddefa8035a (diff)
downloadlinux-stable-f9ebd61855253078fe8b07bacaf516337f8078e8.tar.gz
linux-stable-f9ebd61855253078fe8b07bacaf516337f8078e8.tar.bz2
linux-stable-f9ebd61855253078fe8b07bacaf516337f8078e8.zip
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 'fs/nfs')
-rw-r--r--fs/nfs/client.c1
-rw-r--r--fs/nfs/super.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 19874151e95c..892aefff3630 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -31,7 +31,6 @@
#include <linux/lockd/bind.h>
#include <linux/seq_file.h>
#include <linux/mount.h>
-#include <linux/nfs_idmap.h>
#include <linux/vfs.h>
#include <linux/inet.h>
#include <linux/in6.h>
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 322b2de02988..5cc3da9d9314 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -43,7 +43,6 @@
#include <linux/seq_file.h>
#include <linux/mount.h>
#include <linux/namei.h>
-#include <linux/nfs_idmap.h>
#include <linux/vfs.h>
#include <linux/inet.h>
#include <linux/in6.h>