diff options
author | Alasdair G Kergon | 2005-07-13 00:53:01 +0200 |
---|---|---|
committer | Linus Torvalds | 2005-07-13 01:19:10 +0200 |
commit | f6a80ea8ed44de0b19c42d41928be37a186a3f41 (patch) | |
tree | 2e565669d042e54576a4beaba03145ea35ec2145 /drivers/md/dm-mpath.c | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6 (diff) | |
download | kernel-qcow2-linux-f6a80ea8ed44de0b19c42d41928be37a186a3f41.tar.gz kernel-qcow2-linux-f6a80ea8ed44de0b19c42d41928be37a186a3f41.tar.xz kernel-qcow2-linux-f6a80ea8ed44de0b19c42d41928be37a186a3f41.zip |
[PATCH] device-mapper multipath: Barriers not supported
dm multipath will report barriers as not supported with this patch.
Signed-off-by: Lars Marowsky-Bree <lmb@suse.de>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md/dm-mpath.c')
-rw-r--r-- | drivers/md/dm-mpath.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 0c1b8520ef86..84cdb700a247 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -765,6 +765,9 @@ static int multipath_map(struct dm_target *ti, struct bio *bio, 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 @@ static int do_end_io(struct multipath *m, struct bio *bio, 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) { |