diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/bitmap.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-io.c | 2 | ||||
-rw-r--r-- | drivers/md/dm-kcopyd.c | 5 | ||||
-rw-r--r-- | drivers/md/md.c | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 54bfc274b39a..ca203cb23f3c 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -347,7 +347,7 @@ static void write_page(struct bitmap *bitmap, struct page *page, int wait) | |||
347 | atomic_inc(&bitmap->pending_writes); | 347 | atomic_inc(&bitmap->pending_writes); |
348 | set_buffer_locked(bh); | 348 | set_buffer_locked(bh); |
349 | set_buffer_mapped(bh); | 349 | set_buffer_mapped(bh); |
350 | submit_bh(WRITE | REQ_UNPLUG | REQ_SYNC, bh); | 350 | submit_bh(WRITE | REQ_SYNC, bh); |
351 | bh = bh->b_this_page; | 351 | bh = bh->b_this_page; |
352 | } | 352 | } |
353 | 353 | ||
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index 136d4f71a116..76a5af00a26b 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
@@ -352,7 +352,7 @@ static void dispatch_io(int rw, unsigned int num_regions, | |||
352 | BUG_ON(num_regions > DM_IO_MAX_REGIONS); | 352 | BUG_ON(num_regions > DM_IO_MAX_REGIONS); |
353 | 353 | ||
354 | if (sync) | 354 | if (sync) |
355 | rw |= REQ_SYNC | REQ_UNPLUG; | 355 | rw |= REQ_SYNC; |
356 | 356 | ||
357 | /* | 357 | /* |
358 | * For multiple regions we need to be careful to rewind | 358 | * For multiple regions we need to be careful to rewind |
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c index 400cf35094a4..1bb73a13ca40 100644 --- a/drivers/md/dm-kcopyd.c +++ b/drivers/md/dm-kcopyd.c | |||
@@ -356,11 +356,8 @@ static int run_io_job(struct kcopyd_job *job) | |||
356 | 356 | ||
357 | if (job->rw == READ) | 357 | if (job->rw == READ) |
358 | r = dm_io(&io_req, 1, &job->source, NULL); | 358 | r = dm_io(&io_req, 1, &job->source, NULL); |
359 | else { | 359 | else |
360 | if (job->num_dests > 1) | ||
361 | io_req.bi_rw |= REQ_UNPLUG; | ||
362 | r = dm_io(&io_req, job->num_dests, job->dests, NULL); | 360 | r = dm_io(&io_req, job->num_dests, job->dests, NULL); |
363 | } | ||
364 | 361 | ||
365 | return r; | 362 | return r; |
366 | } | 363 | } |
diff --git a/drivers/md/md.c b/drivers/md/md.c index ca0d79c264b9..28f9c1ee4e3a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -777,8 +777,7 @@ void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, | |||
777 | bio->bi_end_io = super_written; | 777 | bio->bi_end_io = super_written; |
778 | 778 | ||
779 | atomic_inc(&mddev->pending_writes); | 779 | atomic_inc(&mddev->pending_writes); |
780 | submit_bio(REQ_WRITE | REQ_SYNC | REQ_UNPLUG | REQ_FLUSH | REQ_FUA, | 780 | submit_bio(REQ_WRITE | REQ_SYNC | REQ_FLUSH | REQ_FUA, bio); |
781 | bio); | ||
782 | } | 781 | } |
783 | 782 | ||
784 | void md_super_wait(mddev_t *mddev) | 783 | void md_super_wait(mddev_t *mddev) |
@@ -806,7 +805,7 @@ int sync_page_io(mdk_rdev_t *rdev, sector_t sector, int size, | |||
806 | struct completion event; | 805 | struct completion event; |
807 | int ret; | 806 | int ret; |
808 | 807 | ||
809 | rw |= REQ_SYNC | REQ_UNPLUG; | 808 | rw |= REQ_SYNC; |
810 | 809 | ||
811 | bio->bi_bdev = (metadata_op && rdev->meta_bdev) ? | 810 | bio->bi_bdev = (metadata_op && rdev->meta_bdev) ? |
812 | rdev->meta_bdev : rdev->bdev; | 811 | rdev->meta_bdev : rdev->bdev; |