diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
| commit | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (patch) | |
| tree | 7d08afd30c95c04129c20693d974a18799caeb5a /drivers/md/dm-kcopyd.c | |
| parent | 742bd95ba96e19b3f7196c3a0834ebc17c8ba006 (diff) | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/md/dm-kcopyd.c')
| -rw-r--r-- | drivers/md/dm-kcopyd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c index 3073618269ea..0a225da21272 100644 --- a/drivers/md/dm-kcopyd.c +++ b/drivers/md/dm-kcopyd.c | |||
| @@ -344,7 +344,7 @@ static int run_io_job(struct kcopyd_job *job) | |||
| 344 | { | 344 | { |
| 345 | int r; | 345 | int r; |
| 346 | struct dm_io_request io_req = { | 346 | struct dm_io_request io_req = { |
| 347 | .bi_rw = job->rw | (1 << BIO_RW_SYNC), | 347 | .bi_rw = job->rw | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG), |
| 348 | .mem.type = DM_IO_PAGE_LIST, | 348 | .mem.type = DM_IO_PAGE_LIST, |
| 349 | .mem.ptr.pl = job->pages, | 349 | .mem.ptr.pl = job->pages, |
| 350 | .mem.offset = job->offset, | 350 | .mem.offset = job->offset, |