diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-08 11:56:09 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-28 17:20:50 -0400 |
commit | 2f2c63bc221c5fcded24de2704575d0abf96b910 (patch) | |
tree | dacf9f2bdbd101de6525a53571f0f1e48a75902e /fs/nfs/nfs4filelayout.c | |
parent | 98d9452448122486f81030c6c70f29471f65e1ce (diff) |
NFS: Cleanup - only store the write verifier in struct nfs_page
The 'committed' field is not needed once we have put the struct nfs_page
on the right list.
Also correct the type of the verifier: it is not an array of __be32, but
simply an 8 byte long opaque array.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index e1340293872c..85b70639921b 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -351,9 +351,9 @@ static void prepare_to_resend_writes(struct nfs_commit_data *data) | |||
351 | struct nfs_page *first = nfs_list_entry(data->pages.next); | 351 | struct nfs_page *first = nfs_list_entry(data->pages.next); |
352 | 352 | ||
353 | data->task.tk_status = 0; | 353 | data->task.tk_status = 0; |
354 | memcpy(data->verf.verifier, first->wb_verf.verifier, | 354 | memcpy(&data->verf.verifier, &first->wb_verf, |
355 | sizeof(first->wb_verf.verifier)); | 355 | sizeof(data->verf.verifier)); |
356 | data->verf.verifier[0]++; /* ensure verifier mismatch */ | 356 | data->verf.verifier.data[0]++; /* ensure verifier mismatch */ |
357 | } | 357 | } |
358 | 358 | ||
359 | static int filelayout_commit_done_cb(struct rpc_task *task, | 359 | static int filelayout_commit_done_cb(struct rpc_task *task, |