| From aa63fc081f710392ddc5b78147ec5f3909f8063e Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trondmy@gmail.com> |
| Date: Fri, 20 Sep 2019 07:23:40 -0400 |
| Subject: [PATCH] pNFS: Ensure we do clear the return-on-close layout stateid |
| on fatal errors |
| |
| commit 9c47b18cf722184f32148784189fca945a7d0561 upstream. |
| |
| 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: 1c5bd76d17cca ("pNFS: Enable layoutreturn operation for...") |
| Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c |
| index bfe1f4625f60..33c2ef416564 100644 |
| --- a/fs/nfs/pnfs.c |
| +++ b/fs/nfs/pnfs.c |
| @@ -1449,10 +1449,15 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args, |
| const nfs4_stateid *res_stateid = NULL; |
| struct nfs4_xdr_opaque_data *ld_private = args->ld_private; |
| |
| - if (ret == 0) { |
| - arg_stateid = &args->stateid; |
| + switch (ret) { |
| + case -NFS4ERR_NOMATCHING_LAYOUT: |
| + break; |
| + case 0: |
| if (res->lrs_present) |
| res_stateid = &res->stateid; |
| + /* Fallthrough */ |
| + default: |
| + arg_stateid = &args->stateid; |
| } |
| pnfs_layoutreturn_free_lsegs(lo, arg_stateid, &args->range, |
| res_stateid); |
| -- |
| 2.7.4 |
| |