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>
This commit is contained in:
parent
e29e65aacb
commit
4622afb3f5
|
@ -224,7 +224,6 @@ struct kcopyd_job {
|
||||||
unsigned int num_dests;
|
unsigned int num_dests;
|
||||||
struct dm_io_region dests[DM_KCOPYD_MAX_REGIONS];
|
struct dm_io_region dests[DM_KCOPYD_MAX_REGIONS];
|
||||||
|
|
||||||
sector_t offset;
|
|
||||||
unsigned int nr_pages;
|
unsigned int nr_pages;
|
||||||
struct page_list *pages;
|
struct page_list *pages;
|
||||||
|
|
||||||
|
@ -380,7 +379,7 @@ static int run_io_job(struct kcopyd_job *job)
|
||||||
.bi_rw = job->rw,
|
.bi_rw = job->rw,
|
||||||
.mem.type = DM_IO_PAGE_LIST,
|
.mem.type = DM_IO_PAGE_LIST,
|
||||||
.mem.ptr.pl = job->pages,
|
.mem.ptr.pl = job->pages,
|
||||||
.mem.offset = job->offset,
|
.mem.offset = 0,
|
||||||
.notify.fn = complete_io,
|
.notify.fn = complete_io,
|
||||||
.notify.context = job,
|
.notify.context = job,
|
||||||
.client = job->kc->io_client,
|
.client = job->kc->io_client,
|
||||||
|
@ -398,8 +397,7 @@ static int run_pages_job(struct kcopyd_job *job)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
job->nr_pages = dm_div_up(job->dests[0].count + job->offset,
|
job->nr_pages = dm_div_up(job->dests[0].count, PAGE_SIZE >> 9);
|
||||||
PAGE_SIZE >> 9);
|
|
||||||
r = kcopyd_get_pages(job->kc, job->nr_pages, &job->pages);
|
r = kcopyd_get_pages(job->kc, job->nr_pages, &job->pages);
|
||||||
if (!r) {
|
if (!r) {
|
||||||
/* this job is ready for io */
|
/* 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;
|
job->num_dests = num_dests;
|
||||||
memcpy(&job->dests, dests, sizeof(*dests) * num_dests);
|
memcpy(&job->dests, dests, sizeof(*dests) * num_dests);
|
||||||
|
|
||||||
job->offset = 0;
|
|
||||||
job->nr_pages = 0;
|
job->nr_pages = 0;
|
||||||
job->pages = NULL;
|
job->pages = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue