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

Commit af4874e0 authored by Mike Snitzer's avatar Mike Snitzer Committed by Alasdair G Kergon
Browse files

dm target:s introduce iterate devices fn 



Add .iterate_devices to 'struct target_type' to allow a function to be
called for all devices in a DM target.  Implemented it for all targets
except those in dm-snap.c (origin and snapshot).

(The raid1 version number jumps to 1.12 because we originally reserved
1.1 to 1.11 for 'block_on_error' but ended up using 'handle_errors'
instead.)

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Cc: martin.petersen@oracle.com
parent 1197764e

drivers/md/dm-crypt.c

+10 −1
Original line number Diff line number Diff line
@@ -1313,9 +1313,17 @@ static int crypt_merge(struct dm_target *ti, struct bvec_merge_data *bvm, 
	return min(max_size, q->merge_bvec_fn(q, bvm, biovec));

}



static int crypt_iterate_devices(struct dm_target *ti,

				 iterate_devices_callout_fn fn, void *data)

{

	struct crypt_config *cc = ti->private;



	return fn(ti, cc->dev, cc->start, data);

}



static struct target_type crypt_target = {

	.name   = "crypt",

	.version= {1, 6, 0},

	.version = {1, 7, 0},

	.module = THIS_MODULE,

	.ctr    = crypt_ctr,

	.dtr    = crypt_dtr,
@@ -1326,6 +1334,7 @@ static struct target_type crypt_target = { 
	.resume = crypt_resume,

	.message = crypt_message,

	.merge  = crypt_merge,

	.iterate_devices = crypt_iterate_devices,

};



static int __init dm_crypt_init(void)

drivers/md/dm-delay.c

+19 −1
Original line number Diff line number Diff line
@@ -318,9 +318,26 @@ static int delay_status(struct dm_target *ti, status_type_t type, 
	return 0;

}



static int delay_iterate_devices(struct dm_target *ti,

				 iterate_devices_callout_fn fn, void *data)

{

	struct delay_c *dc = ti->private;

	int ret = 0;



	ret = fn(ti, dc->dev_read, dc->start_read, data);

	if (ret)

		goto out;



	if (dc->dev_write)

		ret = fn(ti, dc->dev_write, dc->start_write, data);



out:

	return ret;

}



static struct target_type delay_target = {

	.name	     = "delay",

	.version     = {1, 0, 2},

	.version     = {1, 1, 0},

	.module      = THIS_MODULE,

	.ctr	     = delay_ctr,

	.dtr	     = delay_dtr,
@@ -328,6 +345,7 @@ static struct target_type delay_target = { 
	.presuspend  = delay_presuspend,

	.resume	     = delay_resume,

	.status	     = delay_status,

	.iterate_devices = delay_iterate_devices,

};



static int __init dm_delay_init(void)

drivers/md/dm-linear.c

+10 −1
Original line number Diff line number Diff line
@@ -134,9 +134,17 @@ static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm, 
	return min(max_size, q->merge_bvec_fn(q, bvm, biovec));

}



static int linear_iterate_devices(struct dm_target *ti,

				  iterate_devices_callout_fn fn, void *data)

{

	struct linear_c *lc = ti->private;



	return fn(ti, lc->dev, lc->start, data);

}



static struct target_type linear_target = {

	.name   = "linear",

	.version= {1, 0, 3},

	.version = {1, 1, 0},

	.module = THIS_MODULE,

	.ctr    = linear_ctr,

	.dtr    = linear_dtr,
@@ -144,6 +152,7 @@ static struct target_type linear_target = { 
	.status = linear_status,

	.ioctl  = linear_ioctl,

	.merge  = linear_merge,

	.iterate_devices = linear_iterate_devices,

};



int __init dm_linear_init(void)

drivers/md/dm-mpath.c

+22 −1
Original line number Diff line number Diff line
@@ -1450,12 +1450,32 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd, 
	return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);

}



static int multipath_iterate_devices(struct dm_target *ti,

				     iterate_devices_callout_fn fn, void *data)

{

	struct multipath *m = ti->private;

	struct priority_group *pg;

	struct pgpath *p;

	int ret = 0;



	list_for_each_entry(pg, &m->priority_groups, list) {

		list_for_each_entry(p, &pg->pgpaths, list) {

			ret = fn(ti, p->path.dev, ti->begin, data);

			if (ret)

				goto out;

		}

	}



out:

	return ret;

}



/*-----------------------------------------------------------------

 * Module setup

 *---------------------------------------------------------------*/

static struct target_type multipath_target = {

	.name = "multipath",

	.version = {1, 0, 5},

	.version = {1, 1, 0},

	.module = THIS_MODULE,

	.ctr = multipath_ctr,

	.dtr = multipath_dtr,
@@ -1466,6 +1486,7 @@ static struct target_type multipath_target = { 
	.status = multipath_status,

	.message = multipath_message,

	.ioctl  = multipath_ioctl,

	.iterate_devices = multipath_iterate_devices,

};



static int __init dm_multipath_init(void)

drivers/md/dm-raid1.c

+16 −1
Original line number Diff line number Diff line
@@ -1283,9 +1283,23 @@ static int mirror_status(struct dm_target *ti, status_type_t type, 
	return 0;

}



static int mirror_iterate_devices(struct dm_target *ti,

				  iterate_devices_callout_fn fn, void *data)

{

	struct mirror_set *ms = ti->private;

	int ret = 0;

	unsigned i;



	for (i = 0; !ret && i < ms->nr_mirrors; i++)

		ret = fn(ti, ms->mirror[i].dev,

			 ms->mirror[i].offset, data);



	return ret;

}



static struct target_type mirror_target = {

	.name	 = "mirror",

	.version = {1, 0, 20},

	.version = {1, 12, 0},

	.module	 = THIS_MODULE,

	.ctr	 = mirror_ctr,

	.dtr	 = mirror_dtr,
@@ -1295,6 +1309,7 @@ static struct target_type mirror_target = { 
	.postsuspend = mirror_postsuspend,

	.resume	 = mirror_resume,

	.status	 = mirror_status,

	.iterate_devices = mirror_iterate_devices,

};



static int __init dm_mirror_init(void)