[PATCH 005 of 9] knfsd: nfsd4: clean up exp_pseudoroot

From: NeilBrown
Date: Mon Sep 04 2006 - 19:14:10 EST



From: J.Bruce Fields <bfields@xxxxxxxxxxxx>

The previous patch enables some minor simplification here.

Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>

### Diffstat output
./fs/nfsd/export.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff .prev/fs/nfsd/export.c ./fs/nfsd/export.c
--- .prev/fs/nfsd/export.c 2006-09-04 17:18:25.000000000 +1000
+++ ./fs/nfsd/export.c 2006-09-04 17:20:22.000000000 +1000
@@ -1058,14 +1058,11 @@ exp_pseudoroot(struct auth_domain *clp,
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;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/