---

yaml --- r: 38394 b: refs/heads/master c: d0ebd9c h: refs/heads/master v: v3
git-mirror · Oct 4, 2006 · ee54859 · ee54859
1 parent e86b8c5
commit ee54859
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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;
 }