Commit 2e19d10c authored by Trond Myklebust's avatar Trond Myklebust Committed by Chuck Lever
Browse files

nfsd: Fix up nfsd to ensure that timeout errors don't result in ESTALE 



If the underlying filesystem times out, then we want knfsd to return
NFSERR_JUKEBOX/DELAY rather than NFSERR_STALE.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent d045465f

fs/nfsd/nfsfh.c

+12 −4
Original line number Diff line number Diff line
@@ -268,12 +268,20 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp) 
	if (fileid_type == FILEID_ROOT)

		dentry = dget(exp->ex_path.dentry);

	else {

		dentry = exportfs_decode_fh(exp->ex_path.mnt, fid,

		dentry = exportfs_decode_fh_raw(exp->ex_path.mnt, fid,

						data_left, fileid_type,

						nfsd_acceptable, exp);

		if (IS_ERR_OR_NULL(dentry))

		if (IS_ERR_OR_NULL(dentry)) {

			trace_nfsd_set_fh_dentry_badhandle(rqstp, fhp,

					dentry ?  PTR_ERR(dentry) : -ESTALE);

			switch (PTR_ERR(dentry)) {

			case -ENOMEM:

			case -ETIMEDOUT:

				break;

			default:

				dentry = ERR_PTR(-ESTALE);

			}

		}

	}

	if (dentry == NULL)

		goto out;