Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0ebd9c0 authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: nfsd4: clean up exp_pseudoroot 



The previous patch enables some minor simplification here.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f38b20c6

fs/nfsd/export.c

+4 −7
Original line number Diff line number Diff line
@@ -1058,14 +1058,11 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, 
	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);

		return nfserrno(PTR_ERR(exp));

	rv = fh_compose(fhp, exp, exp->ex_dentry, NULL);

	exp_put(exp);

	}

	return rv;

}