dm: disable barriers
Alasdair G Kergon
maintainerPATCH 11/18 dm: disable barriers
From: Stefan Bader <[email protected]>
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.
Signed-off-by Stefan Bader <[email protected]>
Signed-off-by Alasdair G Kergon <[email protected]>
---
drivers/md/dm-crypt.c | 3 --- drivers/md/dm-mpath.c | 3 --- drivers/md/dm-snap.c | 6 ------ drivers/md/dm.c | 9 +++++++++ 4 files changed, 9 insertions(+), 12 deletions(-)
drivers/md/dm-crypt.c +0 -3
@@ -941,9 +941,6 @@ static int crypt_map(struct dm_target *tstruct crypt_config *cc = ti->private;struct dm_crypt_io *io; -if (bio_barrier (bio)) -return -EOPNOTSUPP ; - io =mempool_alloc (cc->io_pool,GFP_NOIO ); io->target = ti; io->base_bio = bio;
drivers/md/dm-mpath.c +0 -3
@@ -798,9 +798,6 @@ static int multipath_map(struct dm_targestruct dm_mpath_io *mpio;struct multipath *m = (struct multipath *) ti->private; -if (bio_barrier (bio)) -return -EOPNOTSUPP ; - mpio =mempool_alloc (m->mpio_pool,GFP_NOIO );dm_bio_record (&mpio->details, bio);
drivers/md/dm-snap.c +0 -6
@@ -889,9 +889,6 @@ static int snapshot_map(struct dm_targetif (!s->valid)return -EIO ; -if (unlikely (bio_barrier (bio))) -return -EOPNOTSUPP ; -/* FIXME: should only take write lock if we need * to copy an exception */ down_write (&s->lock);
@@ -1162,9 +1159,6 @@ static int origin_map(struct dm_target *struct dm_dev *dev = ti->private; bio->bi_bdev = dev->bdev; -if (unlikely (bio_barrier (bio))) -return -EOPNOTSUPP ; -/* Only tell snapshots if this is a write */ return (bio_rw (bio) ==WRITE ) ?do_origin (dev, bio) :DM_MAPIO_REMAPPED ; }
drivers/md/dm.c +9 -0
@@ -800,6 +800,15 @@ static int dm_request(request_queue_t *qint rw =bio_data_dir (bio);struct mapped_device *md = q->queuedata; +/* +* There is no use in forwarding any barrier request since we can't +* guarantee it is (or can be) handled by the targets correctly. +*/ +if (unlikely (bio_barrier (bio))) { +bio_endio (bio, bio->bi_size, -EOPNOTSUPP ); +return 0 ; + } +down_read (&md->io_lock);disk_stat_inc (dm_disk (md), ios[rw]);