dm multipath will report barriers as not supported with this patch.
Signed-off-by: Lars Marowsky-Bree <[EMAIL PROTECTED]>
Signed-Off-By: Alasdair G Kergon <[EMAIL PROTECTED]>
--- diff/drivers/md/dm-mpath.c 2005-06-17 20:48:29.000000000 +0100
+++ source/drivers/md/dm-mpath.c 2005-07-08 19:01:41.000000000 +0100
@@ -765,6 +765,9 @@
struct 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);
@@ -988,6 +991,9 @@
if ((error == -EWOULDBLOCK) && bio_rw_ahead(bio))
return error;
+ if (error == -EOPNOTSUPP)
+ return error;
+
spin_lock(&m->lock);
if (!m->nr_valid_paths) {
if (!m->queue_if_no_path || m->suspended) {
--- diff/drivers/md/dm-snap.c 2005-06-17 20:48:29.000000000 +0100
+++ source/drivers/md/dm-snap.c 2005-07-08 19:01:41.000000000 +0100
@@ -777,7 +777,7 @@
/* Full snapshots are not usable */
if (!s->valid)
- return -1;
+ return -EIO;
/*
* Write to snapshot - higher level takes care of RW/RO
--- diff/drivers/md/dm.c 2005-06-17 20:48:29.000000000 +0100
+++ source/drivers/md/dm.c 2005-07-08 19:01:41.000000000 +0100
@@ -384,7 +384,7 @@
/* error the io and bail out */
struct dm_io *io = tio->io;
free_tio(tio->io->md, tio);
- dec_pending(io, -EIO);
+ dec_pending(io, r);
bio_put(clone);
}
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
