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

Commit d70ab4fb authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Mike Snitzer
Browse files

dm: remove dm_get_mapinfo 



Remove dm_get_mapinfo() because no target uses it.  Targets can allocate
per-bio data using ti->per_bio_data_size, this is much more flexible
than union map_info.

Leave union map_info only for the request-based multipath target's use.
Also delete the unused "unsigned long long ll" field of union map_info.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 473c36df

drivers/md/dm.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -94,13 +94,6 @@ struct dm_rq_clone_bio_info { 
	struct bio clone;

	struct bio clone;

};

};





union map_info *dm_get_mapinfo(struct bio *bio)

{

	if (bio && bio->bi_private)

		return &((struct dm_target_io *)bio->bi_private)->info;

	return NULL;

}



union map_info *dm_get_rq_mapinfo(struct request *rq)

union map_info *dm_get_rq_mapinfo(struct request *rq)

{

{

	if (rq && rq->end_io_data)

	if (rq && rq->end_io_data)
@@ -1195,7 +1188,6 @@ static struct dm_target_io *alloc_tio(struct clone_info *ci, 




	tio->io = ci->io;

	tio->io = ci->io;

	tio->ti = ti;

	tio->ti = ti;

	memset(&tio->info, 0, sizeof(tio->info));

	tio->target_bio_nr = target_bio_nr;

	tio->target_bio_nr = target_bio_nr;





	return tio;

	return tio;
@@ -2873,8 +2865,6 @@ static const struct block_device_operations dm_blk_dops = { 
	.owner = THIS_MODULE

	.owner = THIS_MODULE

};

};





EXPORT_SYMBOL(dm_get_mapinfo);



/*

/*

 * module hooks

 * module hooks

 */

 */

include/linux/device-mapper.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ typedef enum { STATUSTYPE_INFO, STATUSTYPE_TABLE } status_type_t; 




union map_info {

union map_info {

	void *ptr;

	void *ptr;

	unsigned long long ll;

};

};





/*

/*
@@ -291,7 +290,6 @@ struct dm_target_callbacks { 
struct dm_target_io {

struct dm_target_io {

	struct dm_io *io;

	struct dm_io *io;

	struct dm_target *ti;

	struct dm_target *ti;

	union map_info info;

	unsigned target_bio_nr;

	unsigned target_bio_nr;

	struct bio clone;

	struct bio clone;

};

};
@@ -403,7 +401,6 @@ int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid); 
struct gendisk *dm_disk(struct mapped_device *md);

struct gendisk *dm_disk(struct mapped_device *md);

int dm_suspended(struct dm_target *ti);

int dm_suspended(struct dm_target *ti);

int dm_noflush_suspending(struct dm_target *ti);

int dm_noflush_suspending(struct dm_target *ti);

union map_info *dm_get_mapinfo(struct bio *bio);

union map_info *dm_get_rq_mapinfo(struct request *rq);

union map_info *dm_get_rq_mapinfo(struct request *rq);





struct queue_limits *dm_get_queue_limits(struct mapped_device *md);

struct queue_limits *dm_get_queue_limits(struct mapped_device *md);