diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-01-29 12:26:57 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-01-29 12:26:57 -0500 |
| commit | 905e7dafbe1c69dd69197a9e8ba2e4bf518c9926 (patch) | |
| tree | 519e1a96e572d220707135ac355328a138d2f4cc | |
| parent | a13ce7c629366880c1072d4d113d3dab6c53510d (diff) | |
NFSv4.1: Cleanup
It is now completely safe to call nfs41_sequence_free_slot with a NULL
slot.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/nfs4filelayout.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 20a56fa271bd..12c8132ad408 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
| @@ -336,8 +336,7 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data) | |||
| 336 | 336 | ||
| 337 | if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) && | 337 | if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) && |
| 338 | task->tk_status == 0) { | 338 | task->tk_status == 0) { |
| 339 | if (rdata->res.seq_res.sr_slot != NULL) | 339 | nfs41_sequence_done(task, &rdata->res.seq_res); |
| 340 | nfs41_sequence_done(task, &rdata->res.seq_res); | ||
| 341 | return; | 340 | return; |
| 342 | } | 341 | } |
| 343 | 342 | ||
| @@ -446,8 +445,7 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data) | |||
| 446 | 445 | ||
| 447 | if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) && | 446 | if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) && |
| 448 | task->tk_status == 0) { | 447 | task->tk_status == 0) { |
| 449 | if (wdata->res.seq_res.sr_slot != NULL) | 448 | nfs41_sequence_done(task, &wdata->res.seq_res); |
| 450 | nfs41_sequence_done(task, &wdata->res.seq_res); | ||
| 451 | return; | 449 | return; |
| 452 | } | 450 | } |
| 453 | 451 | ||
