Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 308639
b: refs/heads/master
c: bd4aeff
h: refs/heads/master
i:
  308637: 93f6757
  308635: 94b3faf
  308631: 602a019
  308623: fac95a4
  308607: 1b9db5b
v: v3
  • Loading branch information
Andy Adamson authored and Trond Myklebust committed May 22, 2012
1 parent c424fec commit 7d1df4a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 996074cb8c355bf3d87d066ba1e1189ba3f648f5
refs/heads/master: bd4aeffb5b89070ae93c579f1d5a0758f7123e8b
6 changes: 4 additions & 2 deletions trunk/fs/nfs/nfs4filelayout.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 7d1df4a

Please sign in to comment.