aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-snap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/dm-snap.c')
-rw-r--r--drivers/md/dm-snap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index f30f6e8d594e..53cf79d8bcbc 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -1585,7 +1585,7 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
1585 chunk_t chunk; 1585 chunk_t chunk;
1586 struct dm_snap_pending_exception *pe = NULL; 1586 struct dm_snap_pending_exception *pe = NULL;
1587 1587
1588 if (unlikely(bio_empty_barrier(bio))) { 1588 if (bio->bi_rw & REQ_FLUSH) {
1589 bio->bi_bdev = s->cow->bdev; 1589 bio->bi_bdev = s->cow->bdev;
1590 return DM_MAPIO_REMAPPED; 1590 return DM_MAPIO_REMAPPED;
1591 } 1591 }
@@ -1689,7 +1689,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio,
1689 int r = DM_MAPIO_REMAPPED; 1689 int r = DM_MAPIO_REMAPPED;
1690 chunk_t chunk; 1690 chunk_t chunk;
1691 1691
1692 if (unlikely(bio_empty_barrier(bio))) { 1692 if (bio->bi_rw & REQ_FLUSH) {
1693 if (!map_context->target_request_nr) 1693 if (!map_context->target_request_nr)
1694 bio->bi_bdev = s->origin->bdev; 1694 bio->bi_bdev = s->origin->bdev;
1695 else 1695 else
@@ -2133,7 +2133,7 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
2133 struct dm_dev *dev = ti->private; 2133 struct dm_dev *dev = ti->private;
2134 bio->bi_bdev = dev->bdev; 2134 bio->bi_bdev = dev->bdev;
2135 2135
2136 if (unlikely(bio_empty_barrier(bio))) 2136 if (bio->bi_rw & REQ_FLUSH)
2137 return DM_MAPIO_REMAPPED; 2137 return DM_MAPIO_REMAPPED;
2138 2138
2139 /* Only tell snapshots if this is a write */ 2139 /* Only tell snapshots if this is a write */