nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors

Browse source 
IF the server rejected our layout return with a state error such as
NFS4ERR_BAD_STATEID, or even a stale inode error, then we do want
to clear out all the remaining layout segments and mark that stateid
as invalid.

Fixes: 1c5bd76d17 ("pNFS: Enable layoutreturn operation for...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2019-09-20 07:23:40 -04:00 committed by Anna Schumaker
parent 581057c834
commit 9c47b18cf7
1 changed files with 7 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
fs/nfs/pnfs.c
View file

@ -1449,10 +1449,15 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,
const nfs4_stateid *res_stateid = NULL; const nfs4_stateid *res_stateid = NULL;
struct nfs4_xdr_opaque_data *ld_private = args->ld_private; struct nfs4_xdr_opaque_data *ld_private = args->ld_private;
if (ret == 0) { switch (ret) {
arg_stateid = &args->stateid; case -NFS4ERR_NOMATCHING_LAYOUT:
break;
case 0:
if (res->lrs_present) if (res->lrs_present)
res_stateid = &res->stateid; res_stateid = &res->stateid;
/* Fallthrough */
default:
arg_stateid = &args->stateid;
} }
pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range, pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range,
res_stateid); res_stateid);