These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / md / dm-era-target.c

diff --git a/kernel/drivers/md/dm-era-target.c b/kernel/drivers/md/dm-era-target.c
index ad913cd..665bf32 100644 (file)
--- a/kernel/drivers/md/dm-era-target.c
+++ b/kernel/drivers/md/dm-era-target.c
@@ -343,7 +343,9 @@ static int superblock_all_zeroes(struct dm_block_manager *bm, bool *result)
                }
        }
 
-       return dm_bm_unlock(b);
+       dm_bm_unlock(b);
+
+       return 0;
 }
 
 /*----------------------------------------------------------------*/
@@ -582,7 +584,9 @@ static int open_metadata(struct era_metadata *md)
        md->metadata_snap = le64_to_cpu(disk->metadata_snap);
        md->archived_writesets = true;
 
-       return dm_bm_unlock(sblock);
+       dm_bm_unlock(sblock);
+
+       return 0;
 
 bad:
        dm_bm_unlock(sblock);
@@ -1046,12 +1050,7 @@ static int metadata_take_snap(struct era_metadata *md)
 
        md->metadata_snap = dm_block_location(clone);
 
-       r = dm_tm_unlock(md->tm, clone);
-       if (r) {
-               DMERR("%s: couldn't unlock clone", __func__);
-               md->metadata_snap = SUPERBLOCK_LOCATION;
-               return r;
-       }
+       dm_tm_unlock(md->tm, clone);
 
        return 0;
 }
@@ -1673,20 +1672,6 @@ static int era_iterate_devices(struct dm_target *ti,
        return fn(ti, era->origin_dev, 0, get_dev_size(era->origin_dev), data);
 }
 
-static int era_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
-                    struct bio_vec *biovec, int max_size)
-{
-       struct era *era = ti->private;
-       struct request_queue *q = bdev_get_queue(era->origin_dev->bdev);
-
-       if (!q->merge_bvec_fn)
-               return max_size;
-
-       bvm->bi_bdev = era->origin_dev->bdev;
-
-       return min(max_size, q->merge_bvec_fn(q, bvm, biovec));
-}
-
 static void era_io_hints(struct dm_target *ti, struct queue_limits *limits)
 {
        struct era *era = ti->private;
@@ -1717,7 +1702,6 @@ static struct target_type era_target = {
        .status = era_status,
        .message = era_message,
        .iterate_devices = era_iterate_devices,
-       .merge = era_merge,
        .io_hints = era_io_hints
 };