aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 64d48249c03b..1a74c12f0a6e 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1105,6 +1105,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)
1105 const unsigned long do_fua = (bio->bi_rw & REQ_FUA); 1105 const unsigned long do_fua = (bio->bi_rw & REQ_FUA);
1106 const unsigned long do_discard = (bio->bi_rw 1106 const unsigned long do_discard = (bio->bi_rw
1107 & (REQ_DISCARD | REQ_SECURE)); 1107 & (REQ_DISCARD | REQ_SECURE));
1108 const unsigned long do_same = (bio->bi_rw & REQ_WRITE_SAME);
1108 unsigned long flags; 1109 unsigned long flags;
1109 struct md_rdev *blocked_rdev; 1110 struct md_rdev *blocked_rdev;
1110 struct blk_plug_cb *cb; 1111 struct blk_plug_cb *cb;
@@ -1460,7 +1461,8 @@ retry_write:
1460 rdev)); 1461 rdev));
1461 mbio->bi_bdev = rdev->bdev; 1462 mbio->bi_bdev = rdev->bdev;
1462 mbio->bi_end_io = raid10_end_write_request; 1463 mbio->bi_end_io = raid10_end_write_request;
1463 mbio->bi_rw = WRITE | do_sync | do_fua | do_discard; 1464 mbio->bi_rw =
1465 WRITE | do_sync | do_fua | do_discard | do_same;
1464 mbio->bi_private = r10_bio; 1466 mbio->bi_private = r10_bio;
1465 1467
1466 atomic_inc(&r10_bio->remaining); 1468 atomic_inc(&r10_bio->remaining);
@@ -1502,7 +1504,8 @@ retry_write:
1502 r10_bio, rdev)); 1504 r10_bio, rdev));
1503 mbio->bi_bdev = rdev->bdev; 1505 mbio->bi_bdev = rdev->bdev;
1504 mbio->bi_end_io = raid10_end_write_request; 1506 mbio->bi_end_io = raid10_end_write_request;
1505 mbio->bi_rw = WRITE | do_sync | do_fua | do_discard; 1507 mbio->bi_rw =
1508 WRITE | do_sync | do_fua | do_discard | do_same;
1506 mbio->bi_private = r10_bio; 1509 mbio->bi_private = r10_bio;
1507 1510
1508 atomic_inc(&r10_bio->remaining); 1511 atomic_inc(&r10_bio->remaining);
@@ -3569,6 +3572,8 @@ static int run(struct mddev *mddev)
3569 if (mddev->queue) { 3572 if (mddev->queue) {
3570 blk_queue_max_discard_sectors(mddev->queue, 3573 blk_queue_max_discard_sectors(mddev->queue,
3571 mddev->chunk_sectors); 3574 mddev->chunk_sectors);
3575 blk_queue_max_write_same_sectors(mddev->queue,
3576 mddev->chunk_sectors);
3572 blk_queue_io_min(mddev->queue, chunk_size); 3577 blk_queue_io_min(mddev->queue, chunk_size);
3573 if (conf->geo.raid_disks % conf->geo.near_copies) 3578 if (conf->geo.raid_disks % conf->geo.near_copies)
3574 blk_queue_io_opt(mddev->queue, chunk_size * conf->geo.raid_disks); 3579 blk_queue_io_opt(mddev->queue, chunk_size * conf->geo.raid_disks);