From 195994d23fe26437db047f2ef048b21dbc67f70e Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Tue, 2 Aug 2011 12:32:02 +0100 Subject: [PATCH] --- yaml --- r: 262191 b: refs/heads/master c: 5bf45a3dcdba9ff43959f7b5b44523fab254c19c h: refs/heads/master i: 262189: 09bdec8736ddadf4f36ad3907289e652c3183e32 262187: 0b5b637f25fef7a3461f870cdf271ff1d53950d2 262183: ffd08e74ac0e36c8a429f058ad9ad1a803db275d 262175: a86d352868714b74cc9cb49df36972f84d02027e v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-kcopyd.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9dfcaa75ac5c..f004539a4973 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4622afb3f50e03ce6da42002e7ed3675dfafc187 +refs/heads/master: 5bf45a3dcdba9ff43959f7b5b44523fab254c19c diff --git a/trunk/drivers/md/dm-kcopyd.c b/trunk/drivers/md/dm-kcopyd.c index e7926fa1eef2..98725e119324 100644 --- a/trunk/drivers/md/dm-kcopyd.c +++ b/trunk/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;