From d6ba1ee4783431927574fe0faab4d9234e6cd5b2 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 15 Aug 2008 16:59:14 -0400
Subject: [PATCH] --- yaml --- r: 115377 b: refs/heads/master c:
 ff3525a539f5cc81970d08304bdedb4ffba984da h: refs/heads/master i:   115375:
 02e9cf8cb5eef304415c6c97939c34b9e5d418b2 v: v3

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

diff --git a/[refs] b/[refs]
index 6e2bb9b02951..e2e616c4bbd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eec952e42314b53e48fef1f54dd89cbf9789734
+refs/heads/master: ff3525a539f5cc81970d08304bdedb4ffba984da
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index 2accb67427c6..7547600b6174 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -675,7 +675,7 @@ static int nfs_init_server(struct nfs_server *server,
 	server->nfs_client = clp;
 
 	/* Initialise the client representation from the mount data */
-	server->flags = data->flags & NFS_MOUNT_FLAGMASK;
+	server->flags = data->flags;
 
 	if (data->rsize)
 		server->rsize = nfs_block_size(data->rsize, NULL);
@@ -1072,7 +1072,7 @@ static int nfs4_init_server(struct nfs_server *server,
 		goto error;
 
 	/* Initialise the client representation from the mount data */
-	server->flags = data->flags & NFS_MOUNT_FLAGMASK;
+	server->flags = data->flags;
 	server->caps |= NFS_CAP_ATOMIC_OPEN;
 
 	if (data->rsize)
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index e527fab40419..81686aeb1b5d 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1550,7 +1550,7 @@ static int nfs_validate_mount_data(void *options,
 		 * Translate to nfs_parsed_mount_data, which nfs_fill_super
 		 * can deal with.
 		 */
-		args->flags		= data->flags;
+		args->flags		= data->flags & NFS_MOUNT_FLAGMASK;
 		args->rsize		= data->rsize;
 		args->wsize		= data->wsize;
 		args->timeo		= data->timeo;