Commit 6899320c authored Dec 13, 2006 by J.Bruce Fields Committed by Linus Torvalds Dec 13, 2006

[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
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>

parent 4b41bd85

fs/nfsd/export.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;