From 7c6c358d647ebc5efd05fdc5b409774fab327149 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 20 Aug 2012 12:42:15 -0400
Subject: [PATCH] --- yaml --- r: 322113 b: refs/heads/master c:
 086600430493e04b802bee6e5b3ce0458e4eb77f h: refs/heads/master i:   322111:
 f2ed3ece288bd20003cdd3b27134e74d09c2bf34 v: v3

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

diff --git a/[refs] b/[refs]
index ad5ef6dcc9c4..41d9721d2735 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7653f6ff4ebab2a094e65b60fb19ee66ed2f78e7
+refs/heads/master: 086600430493e04b802bee6e5b3ce0458e4eb77f
diff --git a/trunk/fs/nfs/nfs3proc.c b/trunk/fs/nfs/nfs3proc.c
index 0952c791df36..d6b3b5f2d779 100644
--- a/trunk/fs/nfs/nfs3proc.c
+++ b/trunk/fs/nfs/nfs3proc.c
@@ -69,7 +69,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle,
 	nfs_fattr_init(info->fattr);
 	status = rpc_call_sync(client, &msg, 0);
 	dprintk("%s: reply fsinfo: %d\n", __func__, status);
-	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {
+	if (status == 0 && !(info->fattr->valid & NFS_ATTR_FATTR)) {
 		msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR];
 		msg.rpc_resp = info->fattr;
 		status = rpc_call_sync(client, &msg, 0);