summaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-kcopyd.c
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2011-08-02 12:32:02 +0100
committerAlasdair G Kergon <agk@redhat.com>2011-08-02 12:32:02 +0100
commit4622afb3f50e03ce6da42002e7ed3675dfafc187 (patch)
tree6143b3a7a3963c693cd018886ff51e10113c8805 /drivers/md/dm-kcopyd.c
parente29e65aacbd9e628378084905cbcf62a9fa4a8cc (diff)
downloadlinux-stable-4622afb3f50e03ce6da42002e7ed3675dfafc187.tar.gz
linux-stable-4622afb3f50e03ce6da42002e7ed3675dfafc187.tar.bz2
linux-stable-4622afb3f50e03ce6da42002e7ed3675dfafc187.zip
dm kcopyd: remove offset field from job structure
The offset field in struct kcopyd_job is always zero so remove it. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-kcopyd.c')
-rw-r--r--drivers/md/dm-kcopyd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 320401dec104..e7926fa1eef2 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];
- sector_t offset;
unsigned int nr_pages;
struct page_list *pages;
@@ -380,7 +379,7 @@ static int run_io_job(struct kcopyd_job *job)
.bi_rw = job->rw,
.mem.type = DM_IO_PAGE_LIST,
.mem.ptr.pl = job->pages,
- .mem.offset = job->offset,
+ .mem.offset = 0,
.notify.fn = complete_io,
.notify.context = job,
.client = job->kc->io_client,
@@ -398,8 +397,7 @@ static int run_pages_job(struct kcopyd_job *job)
{
int r;
- job->nr_pages = dm_div_up(job->dests[0].count + job->offset,
- 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);
if (!r) {
/* this job is ready for io */
@@ -602,7 +600,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->offset = 0;
job->nr_pages = 0;
job->pages = NULL;