[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 ac5149d..597b3cb 100644 (file)
--- 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;
 }