From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 13 Apr 2012 04:32:14 +0000 (-0400)
Subject: nfsd: fix compose_entry_fh() failure exits
X-Git-Tag: v3.4-rc4~35^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe39651f08813180f37dc508d950fc7d92b29a8;p=pandora-kernel.git

nfsd: fix compose_entry_fh() failure exits

Restore the original logics ("fail on mountpoints, negatives and in
case of fh_compose() failures").  Since commit 8177e (nfsd: clean up
readdirplus encoding) that got broken -
	rv = fh_compose(fhp, exp, dchild, &cd->fh);
	if (rv)
	       goto out;
	if (!dchild->d_inode)
		goto out;
	rv = 0;
out:
is equivalent to
	rv = fh_compose(fhp, exp, dchild, &cd->fh);
out:
and the second check has no effect whatsoever...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

Reading git-diff-tree failed