From b81cade46fe8c572ffe1ffe4c03984cae8584bef Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Sat, 14 Apr 2007 17:01:15 -0400
Subject: [PATCH] --- yaml --- r: 53526 b: refs/heads/master c:
 74dd34e6e8bb127ff4c182423154b294729b663b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/fs/nfs/client.c           | 3 ++-
 trunk/fs/nfs/super.c            | 1 +
 trunk/include/linux/nfs_mount.h | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6e902be16fc..222857461977 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00a6e7bbf990e3a5e59a9a1e6a68e99c94fe001c
+refs/heads/master: 74dd34e6e8bb127ff4c182423154b294729b663b
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index 2190e6c2792e..5bd03b97002e 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -618,7 +618,8 @@ static int nfs_init_server(struct nfs_server *server, const struct nfs_mount_dat
 	if (clp->cl_nfsversion == 3) {
 		if (server->namelen == 0 || server->namelen > NFS3_MAXNAMLEN)
 			server->namelen = NFS3_MAXNAMLEN;
-		server->caps |= NFS_CAP_READDIRPLUS;
+		if (!(data->flags & NFS_MOUNT_NORDIRPLUS))
+			server->caps |= NFS_CAP_READDIRPLUS;
 	} else {
 		if (server->namelen == 0 || server->namelen > NFS2_MAXNAMLEN)
 			server->namelen = NFS2_MAXNAMLEN;
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 719464a04dda..ca20d3cc2609 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -290,6 +290,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
 		{ NFS_MOUNT_NOAC, ",noac", "" },
 		{ NFS_MOUNT_NONLM, ",nolock", "" },
 		{ NFS_MOUNT_NOACL, ",noacl", "" },
+		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
 		{ 0, NULL, NULL }
 	};
 	const struct proc_nfs_info *nfs_infop;
diff --git a/trunk/include/linux/nfs_mount.h b/trunk/include/linux/nfs_mount.h
index 659c75438454..cc8b9c59acb8 100644
--- a/trunk/include/linux/nfs_mount.h
+++ b/trunk/include/linux/nfs_mount.h
@@ -61,6 +61,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_NOACL		0x0800	/* 4 */
 #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
 #define NFS_MOUNT_FLAGMASK	0xFFFF
 
 #endif