aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-snap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/dm-snap.c')
-rw-r--r--drivers/md/dm-snap.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index e1ecacf2456..59fc18ae52c 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -1567,8 +1567,7 @@ static void remap_exception(struct dm_snapshot *s, struct dm_exception *e,
1567 s->store->chunk_mask); 1567 s->store->chunk_mask);
1568} 1568}
1569 1569
1570static int snapshot_map(struct dm_target *ti, struct bio *bio, 1570static int snapshot_map(struct dm_target *ti, struct bio *bio)
1571 union map_info *map_context)
1572{ 1571{
1573 struct dm_exception *e; 1572 struct dm_exception *e;
1574 struct dm_snapshot *s = ti->private; 1573 struct dm_snapshot *s = ti->private;
@@ -1683,8 +1682,7 @@ out:
1683 * If merging is currently taking place on the chunk in question, the 1682 * If merging is currently taking place on the chunk in question, the
1684 * I/O is deferred by adding it to s->bios_queued_during_merge. 1683 * I/O is deferred by adding it to s->bios_queued_during_merge.
1685 */ 1684 */
1686static int snapshot_merge_map(struct dm_target *ti, struct bio *bio, 1685static int snapshot_merge_map(struct dm_target *ti, struct bio *bio)
1687 union map_info *map_context)
1688{ 1686{
1689 struct dm_exception *e; 1687 struct dm_exception *e;
1690 struct dm_snapshot *s = ti->private; 1688 struct dm_snapshot *s = ti->private;
@@ -1744,8 +1742,7 @@ out_unlock:
1744 return r; 1742 return r;
1745} 1743}
1746 1744
1747static int snapshot_end_io(struct dm_target *ti, struct bio *bio, 1745static int snapshot_end_io(struct dm_target *ti, struct bio *bio, int error)
1748 int error, union map_info *map_context)
1749{ 1746{
1750 struct dm_snapshot *s = ti->private; 1747 struct dm_snapshot *s = ti->private;
1751 1748
@@ -2119,8 +2116,7 @@ static void origin_dtr(struct dm_target *ti)
2119 dm_put_device(ti, dev); 2116 dm_put_device(ti, dev);
2120} 2117}
2121 2118
2122static int origin_map(struct dm_target *ti, struct bio *bio, 2119static int origin_map(struct dm_target *ti, struct bio *bio)
2123 union map_info *map_context)
2124{ 2120{
2125 struct dm_dev *dev = ti->private; 2121 struct dm_dev *dev = ti->private;
2126 bio->bi_bdev = dev->bdev; 2122 bio->bi_bdev = dev->bdev;