提交 ad1a2c87 编写于 作者: J J. Bruce Fields 提交者: Alex Elder

xfs: failure mapping nfs fh to inode should return ESTALE

On xfs exports, nfsd is incorrectly returning ENOENT instead of
ESTALE on attempts to use a filehandle of a deleted file (spotted
with pynfs test PUTFH3).  The ENOENT was coming from xfs_iget.

(It's tempting to wonder whether we should just map all xfs_iget
errors to ESTALE, but I don't believe so--xfs_iget can also return
ENOMEM at least, which we wouldn't want mapped to ESTALE.)

While we're at it, the other return of ENOENT in xfs_nfs_get_inode()
also looks wrong.
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: NAlex Elder <aelder@sgi.com>
上级 adab0f67
...@@ -151,14 +151,14 @@ xfs_nfs_get_inode( ...@@ -151,14 +151,14 @@ xfs_nfs_get_inode(
* We don't use ESTALE directly down the chain to not * We don't use ESTALE directly down the chain to not
* confuse applications using bulkstat that expect EINVAL. * confuse applications using bulkstat that expect EINVAL.
*/ */
if (error == EINVAL) if (error == EINVAL || error == ENOENT)
error = ESTALE; error = ESTALE;
return ERR_PTR(-error); return ERR_PTR(-error);
} }
if (ip->i_d.di_gen != generation) { if (ip->i_d.di_gen != generation) {
IRELE(ip); IRELE(ip);
return ERR_PTR(-ENOENT); return ERR_PTR(-ESTALE);
} }
return VFS_I(ip); return VFS_I(ip);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册