projects / platform / kernel / linux-stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: afcf679) | patch
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)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 13 Apr 2012 14:12:02 +0000 (10:12 -0400)
commitefe39651f08813180f37dc508d950fc7d92b29a8
tree69351781601d1c3c64a91f5728b7b388609281e3tree | snapshot
parentafcf6792afd66209161495f691e19d4fc5460a93commit | diff
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 diff | blob | history
Domain: System / Kernel;