summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2012-05-22 08:09:27 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-22 16:42:42 -0400
commitbd4aeffb5b89070ae93c579f1d5a0758f7123e8b (patch)
tree053682177f4d0211aabcd498c8be6aee768ed195 /fs/nfs
parent996074cb8c355bf3d87d066ba1e1189ba3f648f5 (diff)
downloadop-kernel-dev-bd4aeffb5b89070ae93c579f1d5a0758f7123e8b.zip
op-kernel-dev-bd4aeffb5b89070ae93c579f1d5a0758f7123e8b.tar.gz
NFSv4.1 skip rpc_call_done only on disconnected DS slot_table_waitq tasks
We reset all I/O on a disconnected data server through the pgio layer indicated by the NFS_IOHDR_REDO flag. Differentiate between on-the-wire tasks returning with an error which must call rpc_call_done and tasks woken from the data server slot_table_waitq waiting for a session slot with a status of zero which call rpc_exit in rpc_prepare and need to skip rpc_call_done. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4filelayout.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 4662847..56aa0ec 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -302,7 +302,8 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)
dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);
- if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags))
+ if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
+ task->tk_status == 0)
return;
/* Note this may cause RPC to be resent */
@@ -399,7 +400,8 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data)
{
struct nfs_write_data *wdata = data;
- if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags))
+ if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
+ task->tk_status == 0)
return;
/* Note this may cause RPC to be resent */
OpenPOWER on IntegriCloud