diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2011-08-02 12:32:02 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2011-08-02 12:32:02 +0100 |
| commit | 5bf45a3dcdba9ff43959f7b5b44523fab254c19c (patch) | |
| tree | 5306d66f4afd6336ee07dc59bd3ddf964b57e318 | |
| parent | 4622afb3f50e03ce6da42002e7ed3675dfafc187 (diff) | |
| download | kernel_goldelico_gta04-5bf45a3dcdba9ff43959f7b5b44523fab254c19c.zip kernel_goldelico_gta04-5bf45a3dcdba9ff43959f7b5b44523fab254c19c.tar.gz kernel_goldelico_gta04-5bf45a3dcdba9ff43959f7b5b44523fab254c19c.tar.bz2 | |
dm kcopyd: remove nr_pages field from job structure
The nr_pages field in struct kcopyd_job is only used temporarily in
run_pages_job() to count the number of required pages.
We can use a local variable instead.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
| -rw-r--r-- | drivers/md/dm-kcopyd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c index e7926fa..98725e1 100644 --- a/drivers/md/dm-kcopyd.c +++ b/drivers/md/dm-kcopyd.c @@ -224,7 +224,6 @@ struct kcopyd_job { unsigned int num_dests; struct dm_io_region dests[DM_KCOPYD_MAX_REGIONS]; - unsigned int nr_pages; struct page_list *pages; /* @@ -396,9 +395,9 @@ static int run_io_job(struct kcopyd_job *job) static int run_pages_job(struct kcopyd_job *job) { int r; + unsigned nr_pages = dm_div_up(job->dests[0].count, PAGE_SIZE >> 9); - job->nr_pages = dm_div_up(job->dests[0].count, PAGE_SIZE >> 9); - r = kcopyd_get_pages(job->kc, job->nr_pages, &job->pages); + r = kcopyd_get_pages(job->kc, nr_pages, &job->pages); if (!r) { /* this job is ready for io */ push(&job->kc->io_jobs, job); @@ -600,7 +599,6 @@ int dm_kcopyd_copy(struct dm_kcopyd_client *kc, struct dm_io_region *from, job->num_dests = num_dests; memcpy(&job->dests, dests, sizeof(*dests) * num_dests); - job->nr_pages = 0; job->pages = NULL; job->fn = fn; |