]> err.no Git - linux-2.6/commitdiff
[PATCH] knfsd: nfsd: simplify exp_pseudoroot
authorJ.Bruce Fields <bfields@fieldses.org>
Wed, 13 Dec 2006 08:35:23 +0000 (00:35 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:05:54 +0000 (09:05 -0800)
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
functionality.

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>
fs/nfsd/export.c

index 0747bb5ffcf18a5b117b9ce453232eae18271039..b0591cd172eb7636f95d615c5fa2f0c454202682 100644 (file)
@@ -1163,12 +1163,10 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,
        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);
        exp_put(exp);
        return rv;