openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Trond Myklebust 2020-11-30 17:03:18 -05:00 committed by Chuck Lever
parent d045465fc6
commit 2e19d10c14
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfsd/nfsfh.c
View File

@ -268,12 +268,20 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)
if (fileid_type == FILEID_ROOT) if (fileid_type == FILEID_ROOT)
dentry = dget(exp->ex_path.dentry); dentry = dget(exp->ex_path.dentry);
else { else {
dentry = exportfs_decode_fh(exp->ex_path.mnt, fid, dentry = exportfs_decode_fh_raw(exp->ex_path.mnt, fid,
data_left, fileid_type, data_left, fileid_type,
nfsd_acceptable, exp); nfsd_acceptable, exp);
if (IS_ERR_OR_NULL(dentry)) if (IS_ERR_OR_NULL(dentry)) {
trace_nfsd_set_fh_dentry_badhandle(rqstp, fhp, trace_nfsd_set_fh_dentry_badhandle(rqstp, fhp,
dentry ? PTR_ERR(dentry) : -ESTALE); dentry ? PTR_ERR(dentry) : -ESTALE);
switch (PTR_ERR(dentry)) {
case -ENOMEM:
case -ETIMEDOUT:
break;
default:
dentry = ERR_PTR(-ESTALE);
}
}
} }
if (dentry == NULL) if (dentry == NULL)
goto out; goto out;