Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de3ee57 authored Dec 21, 2012 by Mikulas Patocka Committed by Alasdair G Kergon Dec 21, 2012

dm: remove map_info



This patch removes map_info from bio-based device mapper targets.
map_info is still used for request-based targets.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

parent ee18026a

drivers/md/dm-crypt.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1689,8 +1689,7 @@ static int crypt_ctr(struct dm_target ti, unsigned int argc, char *argv)
	return ret;		return ret;
	}		}

	static int crypt_map(struct dm_target ti, struct bio bio,		static int crypt_map(struct dm_target ti, struct bio bio)
	union map_info *map_context)
	{		{
	struct dm_crypt_io *io;		struct dm_crypt_io *io;
	struct crypt_config *cc = ti->private;		struct crypt_config *cc = ti->private;
	@@ -1846,7 +1845,7 @@ static int crypt_iterate_devices(struct dm_target *ti,

	static struct target_type crypt_target = {		static struct target_type crypt_target = {
	.name = "crypt",		.name = "crypt",
	.version = {1, 11, 0},		.version = {1, 12, 0},
	.module = THIS_MODULE,		.module = THIS_MODULE,
	.ctr = crypt_ctr,		.ctr = crypt_ctr,
	.dtr = crypt_dtr,		.dtr = crypt_dtr,

drivers/md/dm-delay.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -274,8 +274,7 @@ static void delay_resume(struct dm_target *ti)
	atomic_set(&dc->may_delay, 1);		atomic_set(&dc->may_delay, 1);
	}		}

	static int delay_map(struct dm_target ti, struct bio bio,		static int delay_map(struct dm_target ti, struct bio bio)
	union map_info *map_context)
	{		{
	struct delay_c *dc = ti->private;		struct delay_c *dc = ti->private;

	@@ -338,7 +337,7 @@ static int delay_iterate_devices(struct dm_target *ti,

	static struct target_type delay_target = {		static struct target_type delay_target = {
	.name = "delay",		.name = "delay",
	.version = {1, 1, 0},		.version = {1, 2, 0},
	.module = THIS_MODULE,		.module = THIS_MODULE,
	.ctr = delay_ctr,		.ctr = delay_ctr,
	.dtr = delay_dtr,		.dtr = delay_dtr,

drivers/md/dm-flakey.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -270,8 +270,7 @@ static void corrupt_bio_data(struct bio bio, struct flakey_c fc)
	}		}
	}		}

	static int flakey_map(struct dm_target ti, struct bio bio,		static int flakey_map(struct dm_target ti, struct bio bio)
	union map_info *map_context)
	{		{
	struct flakey_c *fc = ti->private;		struct flakey_c *fc = ti->private;
	unsigned elapsed;		unsigned elapsed;
	@@ -321,8 +320,7 @@ static int flakey_map(struct dm_target ti, struct bio bio,
	return DM_MAPIO_REMAPPED;		return DM_MAPIO_REMAPPED;
	}		}

	static int flakey_end_io(struct dm_target ti, struct bio bio,		static int flakey_end_io(struct dm_target ti, struct bio bio, int error)
	int error, union map_info *map_context)
	{		{
	struct flakey_c *fc = ti->private;		struct flakey_c *fc = ti->private;
	struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data));		struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data));

drivers/md/dm-linear.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -88,8 +88,7 @@ static void linear_map_bio(struct dm_target ti, struct bio bio)
	bio->bi_sector = linear_map_sector(ti, bio->bi_sector);		bio->bi_sector = linear_map_sector(ti, bio->bi_sector);
	}		}

	static int linear_map(struct dm_target ti, struct bio bio,		static int linear_map(struct dm_target ti, struct bio bio)
	union map_info *map_context)
	{		{
	linear_map_bio(ti, bio);		linear_map_bio(ti, bio);

drivers/md/dm-raid.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1218,7 +1218,7 @@ static void raid_dtr(struct dm_target *ti)
	context_free(rs);		context_free(rs);
	}		}

	static int raid_map(struct dm_target ti, struct bio bio, union map_info *map_context)		static int raid_map(struct dm_target ti, struct bio bio)
	{		{
	struct raid_set *rs = ti->private;		struct raid_set *rs = ti->private;
	struct mddev *mddev = &rs->md;		struct mddev *mddev = &rs->md;
	@@ -1432,7 +1432,7 @@ static void raid_resume(struct dm_target *ti)

	static struct target_type raid_target = {		static struct target_type raid_target = {
	.name = "raid",		.name = "raid",
	.version = {1, 3, 1},		.version = {1, 4, 0},
	.module = THIS_MODULE,		.module = THIS_MODULE,
	.ctr = raid_ctr,		.ctr = raid_ctr,
	.dtr = raid_dtr,		.dtr = raid_dtr,