[PATCH 05/13] nfsd4: clean up exp_pseudoroot
J. Bruce Fields
bfields at fieldses.org
Fri Sep 1 00:56:46 EDT 2006
From: J. Bruce Fields <bfields at fieldses.org>
The previous patch enables some minor simplification here.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
---
fs/nfsd/export.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index f67d2c4..83b405e 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -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;
}
More information about the NFSv4
mailing list