From: J.Bruce Fields <bfields@fieldses.org>
Date: Wed, 4 Oct 2006 09:16:10 +0000 (-0700)
Subject: [PATCH] knfsd: nfsd4: clean up exp_pseudoroot
X-Git-Tag: v2.6.19-rc1~106
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d0ebd9c0e71d20ea8c2b4a071d2a2b4878ef07d6;p=linux-2.6-omap-h63xx.git

[PATCH] knfsd: nfsd4: clean up exp_pseudoroot

The previous patch enables some minor simplification here.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index ac5149d2537..597b3cbf8b0 100644
--- a/fs/nfsd/export.c
+++ b/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;
 }