Commit:     6899320c2cefe5ae6b606f820ba8b762ba21f34a
Parent:     4b41bd85d5f93af37c2730df172aeb54280be7c3
Author:     J.Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 13 00:35:23 2006 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Dec 13 09:05:54 2006 -0800

    [PATCH] knfsd: nfsd: simplify exp_pseudoroot
    Note there's no need for special handling of -EAGAIN here; nfserrno() does
    what we want already.  So this is a pure cleanup with no change in
    Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
    Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 fs/nfsd/export.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 0747bb5..b0591cd 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1163,12 +1163,10 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh 
        mk_fsid_v1(fsidv, 0);
        exp = exp_find(clp, 1, fsidv, creq);
-       if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN)
-               return nfserr_dropit;
+       if (IS_ERR(exp))
+               return nfserrno(PTR_ERR(exp));
        if (exp == NULL)
                return nfserr_perm;
-       else if (IS_ERR(exp))
-               return nfserrno(PTR_ERR(exp));
        rv = fh_compose(fhp, exp, exp->ex_dentry, NULL);
        return rv;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to