diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-01-04 13:35:46 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-01-10 13:32:51 -0500 |
| commit | 67bbceedc9bb8ad48993a8bd6486054756d711f4 (patch) | |
| tree | 5bc2b9bc91c198d9937f9f9c22e211d37a19ccde /fs/nfs | |
| parent | 86b53fbf08f48d353a86a06aef537e78e82ba721 (diff) | |
| download | linux-67bbceedc9bb8ad48993a8bd6486054756d711f4.tar.gz linux-67bbceedc9bb8ad48993a8bd6486054756d711f4.tar.bz2 linux-67bbceedc9bb8ad48993a8bd6486054756d711f4.zip | |
pNFS: Mark layout for return if return-on-close was not sent
If the layout return-on-close failed because the layoutreturn was never
sent, then we should mark the layout for return again.
Fixes: 9c47b18cf722 ("pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/pnfs.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 07f59dc8cb2e..ccc89fab1802 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1560,12 +1560,18 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args, int ret) { struct pnfs_layout_hdr *lo = args->layout; + struct inode *inode = args->inode; const nfs4_stateid *arg_stateid = NULL; const nfs4_stateid *res_stateid = NULL; struct nfs4_xdr_opaque_data *ld_private = args->ld_private; switch (ret) { case -NFS4ERR_NOMATCHING_LAYOUT: + spin_lock(&inode->i_lock); + if (pnfs_layout_is_valid(lo) && + nfs4_stateid_match_other(&args->stateid, &lo->plh_stateid)) + pnfs_set_plh_return_info(lo, args->range.iomode, 0); + spin_unlock(&inode->i_lock); break; case 0: if (res->lrs_present) |