]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
nfsd: fix compose_entry_fh() failure exits
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 13 Apr 2012 04:32:14 +0000 (00:32 -0400)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 25 Apr 2012 06:14:57 +0000 (11:44 +0530)
commit40f154b36bbc05c623e96ea4295e80c8d16e74bb
treeb9d6bac1a18833c1dce6a93398bcb60c5948a1e9
parent5a6cf22a60f2f3a50c2acb6ad5a742648471ebc4
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>
fs/nfsd/nfs3xdr.c