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

Commit 8215d6ec authored by Nikanth Karthikesan's avatar Nikanth Karthikesan Committed by Alasdair G Kergon
Browse files

dm table: remove unused dm_get_device range parameters 



Remove unused parameters(start and len) of dm_get_device()
and fix the callers.

Signed-off-by: default avatarNikanth Karthikesan <knikanth@suse.de>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 0f3649a9

drivers/md/dm-crypt.c

+1 −2
Original line number Diff line number Diff line
@@ -1160,8 +1160,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}

	cc->start = tmpll;



	if (dm_get_device(ti, argv[3], cc->start, ti->len,

			  dm_table_get_mode(ti->table), &cc->dev)) {

	if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table), &cc->dev)) {

		ti->error = "Device lookup failed";

		goto bad_device;

	}

drivers/md/dm-delay.c

+4 −4
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad;

	}



	if (dm_get_device(ti, argv[0], dc->start_read, ti->len,

			  dm_table_get_mode(ti->table), &dc->dev_read)) {

	if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),

			  &dc->dev_read)) {

		ti->error = "Device lookup failed";

		goto bad;

	}
@@ -177,8 +177,8 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad_dev_read;

	}



	if (dm_get_device(ti, argv[3], dc->start_write, ti->len,

			  dm_table_get_mode(ti->table), &dc->dev_write)) {

	if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),

			  &dc->dev_write)) {

		ti->error = "Write device lookup failed";

		goto bad_dev_read;

	}

drivers/md/dm-linear.c

+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}

	lc->start = tmp;



	if (dm_get_device(ti, argv[0], lc->start, ti->len,

			  dm_table_get_mode(ti->table), &lc->dev)) {

	if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &lc->dev)) {

		ti->error = "dm-linear: Device lookup failed";

		goto bad;

	}

drivers/md/dm-log.c

+1 −2
Original line number Diff line number Diff line
@@ -543,8 +543,7 @@ static int disk_ctr(struct dm_dirty_log *log, struct dm_target *ti, 
		return -EINVAL;

	}



	r = dm_get_device(ti, argv[0], 0, 0 /* FIXME */,

			  FMODE_READ | FMODE_WRITE, &dev);

	r = dm_get_device(ti, argv[0], FMODE_READ | FMODE_WRITE, &dev);

	if (r)

		return r;

drivers/md/dm-mpath.c

+3 −4
Original line number Diff line number Diff line
@@ -607,8 +607,8 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps, 
	if (!p)

		return ERR_PTR(-ENOMEM);



	r = dm_get_device(ti, shift(as), ti->begin, ti->len,

			  dm_table_get_mode(ti->table), &p->path.dev);

	r = dm_get_device(ti, shift(as), dm_table_get_mode(ti->table),

			  &p->path.dev);

	if (r) {

		ti->error = "error getting device";

		goto bad;
@@ -1505,8 +1505,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv) 
		goto out;

	}



	r = dm_get_device(ti, argv[1], ti->begin, ti->len,

			  dm_table_get_mode(ti->table), &dev);

	r = dm_get_device(ti, argv[1], dm_table_get_mode(ti->table), &dev);

	if (r) {

		DMWARN("message: error getting device %s",

		       argv[1]);