Merge git://git.infradead.org/battery-2.6

[linux-2.6] / drivers / md / dm-snap.c

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 854891d07b59a5e5049267988d94748f18524f35..cee16fadd9ee70379449ce995ac4043d1ff86e5f 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/log2.h>
 
 #include "dm-snap.h"
 #include "dm-bio-list.h"
@@ -415,7 +416,7 @@ static int set_chunk_size(struct dm_snapshot *s, const char *chunk_size_arg,
        chunk_size = round_up(chunk_size, PAGE_SIZE >> 9);
 
        /* Check chunk_size is a power of 2 */
-       if (chunk_size & (chunk_size - 1)) {
+       if (!is_power_of_2(chunk_size)) {
                *error = "Chunk size is not a power of 2";
                return -EINVAL;
        }
@@ -636,7 +637,7 @@ static void error_bios(struct bio *bio)
        while (bio) {
                n = bio->bi_next;
                bio->bi_next = NULL;
-               bio_io_error(bio, bio->bi_size);
+               bio_io_error(bio);
                bio = n;
        }
 }
@@ -889,9 +890,6 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
        if (!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 +1160,6 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
        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;
 }