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

Commit 66482026 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: do not return target from dm_get_live_table_for_ioctl() 



None of the callers actually used the returned target.
Also, just reuse bdev pointer passed to dm_blk_ioctl().

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 4328daa2

drivers/md/dm.c

+13 −20
Original line number Diff line number Diff line
@@ -557,9 +557,10 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo) 
}



static int dm_get_live_table_for_ioctl(struct mapped_device *md,

		struct dm_target **tgt, struct block_device **bdev,

				       struct block_device **bdev,

				       fmode_t *mode, int *srcu_idx)

{

	struct dm_target *tgt;

	struct dm_table *map;

	int r;
@@ -573,9 +574,8 @@ static int dm_get_live_table_for_ioctl(struct mapped_device *md, 
	if (dm_table_get_num_targets(map) != 1)

		goto out;



	*tgt = dm_table_get_target(map, 0);



	if (!(*tgt)->type->prepare_ioctl)

	tgt = dm_table_get_target(map, 0);

	if (!tgt->type->prepare_ioctl)

		goto out;



	if (dm_suspended_md(md)) {
@@ -583,7 +583,7 @@ static int dm_get_live_table_for_ioctl(struct mapped_device *md, 
		goto out;

	}



	r = (*tgt)->type->prepare_ioctl(*tgt, bdev, mode);

	r = tgt->type->prepare_ioctl(tgt, bdev, mode);

	if (r < 0)

		goto out;
@@ -602,11 +602,9 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, 
			unsigned int cmd, unsigned long arg)

{

	struct mapped_device *md = bdev->bd_disk->private_data;

	struct dm_target *tgt;

	struct block_device *tgt_bdev = NULL;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &tgt_bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;
@@ -621,7 +619,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, 
			goto out;

	}



	r =  __blkdev_driver_ioctl(tgt_bdev, mode, cmd, arg);

	r =  __blkdev_driver_ioctl(bdev, mode, cmd, arg);

out:

	dm_put_live_table(md, srcu_idx);

	return r;
@@ -3558,11 +3556,10 @@ static int dm_pr_register(struct block_device *bdev, u64 old_key, u64 new_key, 
{

	struct mapped_device *md = bdev->bd_disk->private_data;

	const struct pr_ops *ops;

	struct dm_target *tgt;

	fmode_t mode;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;
@@ -3581,11 +3578,10 @@ static int dm_pr_reserve(struct block_device *bdev, u64 key, enum pr_type type, 
{

	struct mapped_device *md = bdev->bd_disk->private_data;

	const struct pr_ops *ops;

	struct dm_target *tgt;

	fmode_t mode;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;
@@ -3603,11 +3599,10 @@ static int dm_pr_release(struct block_device *bdev, u64 key, enum pr_type type) 
{

	struct mapped_device *md = bdev->bd_disk->private_data;

	const struct pr_ops *ops;

	struct dm_target *tgt;

	fmode_t mode;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;
@@ -3626,11 +3621,10 @@ static int dm_pr_preempt(struct block_device *bdev, u64 old_key, u64 new_key, 
{

	struct mapped_device *md = bdev->bd_disk->private_data;

	const struct pr_ops *ops;

	struct dm_target *tgt;

	fmode_t mode;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;
@@ -3648,11 +3642,10 @@ static int dm_pr_clear(struct block_device *bdev, u64 key) 
{

	struct mapped_device *md = bdev->bd_disk->private_data;

	const struct pr_ops *ops;

	struct dm_target *tgt;

	fmode_t mode;

	int srcu_idx, r;



	r = dm_get_live_table_for_ioctl(md, &tgt, &bdev, &mode, &srcu_idx);

	r = dm_get_live_table_for_ioctl(md, &bdev, &mode, &srcu_idx);

	if (r < 0)

		return r;