lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFSv4.1 skip rpc_call_done only on disconnected DS slot_table_waitq tasks

Browse Source 
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>
This commit is contained in:
Andy Adamson
2012-05-22 08:09:27 -04:00
committed by Trond Myklebust
parent 996074cb8c
commit bd4aeffb5b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/nfs4filelayout.c
View File

@@ -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); 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; return;
/* Note this may cause RPC to be resent */ /* 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; 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; return;
/* Note this may cause RPC to be resent */ /* Note this may cause RPC to be resent */