From a71aa24e2eea8043b144a47f5e0e69b8302b04bd Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 7 Nov 2011 15:50:32 -0500
Subject: [PATCH] --- yaml --- r: 275862 b: refs/heads/master c:
 a6f498a891c730327645a7afa10c5ae977de6fd8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b7e35d95d3c0..75c462b139a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0486958f57a496212e3c1e3d9194deebba3dc3d4
+refs/heads/master: a6f498a891c730327645a7afa10c5ae977de6fd8
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 069cb8094d43..be2bbac13817 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -2464,8 +2464,7 @@ static int nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, struct qst
 		case -NFS4ERR_BADNAME:
 			return -ENOENT;
 		case -NFS4ERR_MOVED:
-			err = nfs4_get_referral(dir, name, fattr, fhandle);
-			break;
+			return nfs4_get_referral(dir, name, fattr, fhandle);
 		case -NFS4ERR_WRONGSEC:
 			nfs_fixup_secinfo_attributes(fattr, fhandle);
 		}