Commit 4aac0a63 authored by Alasdair G Kergon's avatar Alasdair G Kergon Committed by Linus Torvalds

[PATCH] device-mapper snapshot: barriers not supported

The snapshot and origin targets are incapable of handling barriers and need to
indicate this.
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3eaf840e
...@@ -792,6 +792,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio, ...@@ -792,6 +792,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
if (!s->valid) if (!s->valid)
return -EIO; return -EIO;
if (unlikely(bio_barrier(bio)))
return -EOPNOTSUPP;
/* /*
* Write to snapshot - higher level takes care of RW/RO * Write to snapshot - higher level takes care of RW/RO
* flags so we should only get this if we are * flags so we should only get this if we are
...@@ -1058,6 +1061,9 @@ static int origin_map(struct dm_target *ti, struct bio *bio, ...@@ -1058,6 +1061,9 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
struct dm_dev *dev = (struct dm_dev *) ti->private; struct dm_dev *dev = (struct dm_dev *) ti->private;
bio->bi_bdev = dev->bdev; bio->bi_bdev = dev->bdev;
if (unlikely(bio_barrier(bio)))
return -EOPNOTSUPP;
/* Only tell snapshots if this is a write */ /* Only tell snapshots if this is a write */
return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : 1; return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment