From ee54859da1aece69959c0df2743b9d61a3e56dc6 Mon Sep 17 00:00:00 2001
From: "J.Bruce Fields" <bfields@fieldses.org>
Date: Wed, 4 Oct 2006 02:16:10 -0700
Subject: [PATCH] --- yaml --- r: 38394 b: refs/heads/master c:
 d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/nfsd/export.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d2094eb5f277..72dfb5f44789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f38b20c64519bb812a49b9ef4e10d90367a5af5c
+refs/heads/master: d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index ac5149d25372..597b3cbf8b0b 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -1058,14 +1058,11 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,
 	if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN)
 		return nfserr_dropit;
 	if (exp == NULL)
-		rv = nfserr_perm;
+		return nfserr_perm;
 	else if (IS_ERR(exp))
-		rv = nfserrno(PTR_ERR(exp));
-	else {
-		rv = fh_compose(fhp, exp,
-				exp->ex_dentry, NULL);
-		exp_put(exp);
-	}
+		return nfserrno(PTR_ERR(exp));
+	rv = fh_compose(fhp, exp, exp->ex_dentry, NULL);
+	exp_put(exp);
 	return rv;
 }