From 1a51c1b8ed7e441919a6e451e796ee10945cb864 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 23 Oct 2010 15:43:10 -0400
Subject: [PATCH] --- yaml --- r: 217082 b: refs/heads/master c:
 3201f3dd7370f2d29dfb689ae16f8f5d4066cc33 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 153afe269da6..e14666d9c8af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ad07353003d6ff69fe0b987813bb77b4d5ac23d
+refs/heads/master: 3201f3dd7370f2d29dfb689ae16f8f5d4066cc33
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index a6b00e84bd1a..707975eebb5d 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -3912,7 +3912,7 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,
 	status = decode_attr_mounted_on_fileid(xdr, bitmap, &fileid);
 	if (status < 0)
 		goto xdr_error;
-	if (status != 0) {
+	if (status != 0 && !(fattr->valid & status)) {
 		fattr->fileid = fileid;
 		fattr->valid |= status;
 	}