diff options
| author |   Trond Myklebust <trondmy@gmail.com> | 2019-09-20 07:23:43 -0400 |
|---|---|---|
| committer |   Anna Schumaker <Anna.Schumaker@Netapp.com> | 2019-09-20 15:39:56 -0400 |
| commit | 6109bcf7130126d24a9ec9d881c665d5d9ab0eb4 (patch) | |
| tree | 5978bbc1d2bc3ced82550dddda7545bd54f478c7 /fs/nfs/pnfs.c | |
| parent | NFSv4: Handle NFS4ERR_DELAY correctly in return-on-close (diff) | |
| download | linux-dev-6109bcf7130126d24a9ec9d881c665d5d9ab0eb4.tar.xz linux-dev-6109bcf7130126d24a9ec9d881c665d5d9ab0eb4.zip | |
NFSv4: Handle RPC level errors in LAYOUTRETURN
Handle RPC level errors by assuming that the RPC call was successful.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 6436047dc999..abc7188f1853 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1455,6 +1455,21 @@ int pnfs_roc_done(struct rpc_task *task, struct inode *inode, case 0: retval = 0; break; + case -NFS4ERR_NOMATCHING_LAYOUT: + /* Was there an RPC level error? If not, retry */ + if (task->tk_rpc_status == 0) + break; + /* If the call was not sent, let caller handle it */ + if (!RPC_WAS_SENT(task)) + return 0; + /* + * Otherwise, assume the call succeeded and + * that we need to release the layout + */ + *ret = 0; + (*respp)->lrs_present = 0; + retval = 0; + break; case -NFS4ERR_DELAY: /* Let the caller handle the retry */ *ret = -NFS4ERR_NOMATCHING_LAYOUT; |