aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-snap.c
diff options
context:
space:
mode:
authorStefan Bader <shbader@de.ibm.com>2007-07-12 12:28:33 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 18:01:08 -0400
commit07a83c47cfc00ba5f0f090ccddd3a0703be0eec9 (patch)
treea17d8028f76ba242a04f3c0678644f93cc7eee7d /drivers/md/dm-snap.c
parent943317efdbc295e8a28df3f5cbd549d066ee8b4a (diff)
dm: disable barriers
This patch causes device-mapper to reject any barrier requests. This is done since most of the targets won't handle this correctly anyway. So until the situation improves it is better to reject these requests at the first place. Since barrier requests won't get to the targets, the checks there can be removed. Cc: stable@kernel.org Signed-off-by: Stefan Bader <shbader@de.ibm.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/dm-snap.c')
-rw-r--r--drivers/md/dm-snap.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 854891d07b59..83ddbfe6b8a4 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -889,9 +889,6 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
889 if (!s->valid) 889 if (!s->valid)
890 return -EIO; 890 return -EIO;
891 891
892 if (unlikely(bio_barrier(bio)))
893 return -EOPNOTSUPP;
894
895 /* FIXME: should only take write lock if we need 892 /* FIXME: should only take write lock if we need
896 * to copy an exception */ 893 * to copy an exception */
897 down_write(&s->lock); 894 down_write(&s->lock);
@@ -1162,9 +1159,6 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
1162 struct dm_dev *dev = ti->private; 1159 struct dm_dev *dev = ti->private;
1163 bio->bi_bdev = dev->bdev; 1160 bio->bi_bdev = dev->bdev;
1164 1161
1165 if (unlikely(bio_barrier(bio)))
1166 return -EOPNOTSUPP;
1167
1168 /* Only tell snapshots if this is a write */ 1162 /* Only tell snapshots if this is a write */
1169 return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : DM_MAPIO_REMAPPED; 1163 return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : DM_MAPIO_REMAPPED;
1170} 1164}