diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-mpath.c | 2 | ||||
-rw-r--r-- | drivers/md/multipath.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 103304c1e3b0..9bf3460c5540 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -849,7 +849,7 @@ static int multipath_map(struct dm_target *ti, struct bio *bio, | |||
849 | dm_bio_record(&mpio->details, bio); | 849 | dm_bio_record(&mpio->details, bio); |
850 | 850 | ||
851 | map_context->ptr = mpio; | 851 | map_context->ptr = mpio; |
852 | bio->bi_rw |= (1 << BIO_RW_FAILFAST); | 852 | bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT); |
853 | r = map_io(m, bio, mpio, 0); | 853 | r = map_io(m, bio, mpio, 0); |
854 | if (r < 0 || r == DM_MAPIO_REQUEUE) | 854 | if (r < 0 || r == DM_MAPIO_REQUEUE) |
855 | mempool_free(mpio, m->mpio_pool); | 855 | mempool_free(mpio, m->mpio_pool); |
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 8744014b9d80..d4ac47d11279 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
@@ -167,7 +167,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) | |||
167 | mp_bh->bio = *bio; | 167 | mp_bh->bio = *bio; |
168 | mp_bh->bio.bi_sector += multipath->rdev->data_offset; | 168 | mp_bh->bio.bi_sector += multipath->rdev->data_offset; |
169 | mp_bh->bio.bi_bdev = multipath->rdev->bdev; | 169 | mp_bh->bio.bi_bdev = multipath->rdev->bdev; |
170 | mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST); | 170 | mp_bh->bio.bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT); |
171 | mp_bh->bio.bi_end_io = multipath_end_request; | 171 | mp_bh->bio.bi_end_io = multipath_end_request; |
172 | mp_bh->bio.bi_private = mp_bh; | 172 | mp_bh->bio.bi_private = mp_bh; |
173 | generic_make_request(&mp_bh->bio); | 173 | generic_make_request(&mp_bh->bio); |
@@ -393,7 +393,7 @@ static void multipathd (mddev_t *mddev) | |||
393 | *bio = *(mp_bh->master_bio); | 393 | *bio = *(mp_bh->master_bio); |
394 | bio->bi_sector += conf->multipaths[mp_bh->path].rdev->data_offset; | 394 | bio->bi_sector += conf->multipaths[mp_bh->path].rdev->data_offset; |
395 | bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev; | 395 | bio->bi_bdev = conf->multipaths[mp_bh->path].rdev->bdev; |
396 | bio->bi_rw |= (1 << BIO_RW_FAILFAST); | 396 | bio->bi_rw |= (1 << BIO_RW_FAILFAST_TRANSPORT); |
397 | bio->bi_end_io = multipath_end_request; | 397 | bio->bi_end_io = multipath_end_request; |
398 | bio->bi_private = mp_bh; | 398 | bio->bi_private = mp_bh; |
399 | generic_make_request(bio); | 399 | generic_make_request(bio); |