Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[cascardo/linux.git] / drivers / md / dm-flakey.c

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index b257e46..645e8b4 100644 (file)
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -183,6 +183,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        devname = dm_shift_arg(&as);
 
+       r = -EINVAL;
        if (sscanf(dm_shift_arg(&as), "%llu%c", &tmpll, &dummy) != 1) {
                ti->error = "Invalid device sector";
                goto bad;
@@ -211,7 +212,8 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (r)
                goto bad;
 
-       if (dm_get_device(ti, devname, dm_table_get_mode(ti->table), &fc->dev)) {
+       r = dm_get_device(ti, devname, dm_table_get_mode(ti->table), &fc->dev);
+       if (r) {
                ti->error = "Device lookup failed";
                goto bad;
        }
@@ -224,7 +226,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
 bad:
        kfree(fc);
-       return -EINVAL;
+       return r;
 }
 
 static void flakey_dtr(struct dm_target *ti)
@@ -296,7 +298,7 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)
                 * Drop writes?
                 */
                if (test_bit(DROP_WRITES, &fc->flags)) {
-                       bio_endio(bio, 0);
+                       bio_endio(bio);
                        return DM_MAPIO_SUBMITTED;
                }
 
@@ -387,21 +389,6 @@ static int flakey_ioctl(struct dm_target *ti, unsigned int cmd, unsigned long ar
        return r ? : __blkdev_driver_ioctl(dev->bdev, dev->mode, cmd, arg);
 }
 
-static int flakey_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
-                       struct bio_vec *biovec, int max_size)
-{
-       struct flakey_c *fc = ti->private;
-       struct request_queue *q = bdev_get_queue(fc->dev->bdev);
-
-       if (!q->merge_bvec_fn)
-               return max_size;
-
-       bvm->bi_bdev = fc->dev->bdev;
-       bvm->bi_sector = flakey_map_sector(ti, bvm->bi_sector);
-
-       return min(max_size, q->merge_bvec_fn(q, bvm, biovec));
-}
-
 static int flakey_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data)
 {
        struct flakey_c *fc = ti->private;
@@ -419,7 +406,6 @@ static struct target_type flakey_target = {
        .end_io = flakey_end_io,
        .status = flakey_status,
        .ioctl  = flakey_ioctl,
-       .merge  = flakey_merge,
        .iterate_devices = flakey_iterate_devices,
 };