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

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

dm: stop using bi_private 



Device mapper uses the bio structure's bi_private field as a pointer
to dm_target_io or dm_rq_clone_bio_info.  But a bio structure is
embedded in the dm_target_io and dm_rq_clone_bio_info structures, so the
pointer to the structure that contains the bio can be found with the
container_of() macro.

Remove the use of bi_private and use container_of() instead.

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

drivers/md/dm.c

+3 −4
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ static void dec_pending(struct dm_io *io, int error) 
static void clone_endio(struct bio *bio, int error)

{

	int r = 0;

	struct dm_target_io *tio = bio->bi_private;

	struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);

	struct dm_io *io = tio->io;

	struct mapped_device *md = tio->io->md;

	dm_endio_fn endio = tio->ti->type->end_io;
@@ -787,7 +787,8 @@ static void clone_endio(struct bio *bio, int error) 
 */

static void end_clone_bio(struct bio *clone, int error)

{

	struct dm_rq_clone_bio_info *info = clone->bi_private;

	struct dm_rq_clone_bio_info *info =

		container_of(clone, struct dm_rq_clone_bio_info, clone);

	struct dm_rq_target_io *tio = info->tio;

	struct bio *bio = info->orig;

	unsigned int nr_bytes = info->orig->bi_iter.bi_size;
@@ -1113,7 +1114,6 @@ static void __map_bio(struct dm_target_io *tio) 
	struct dm_target *ti = tio->ti;



	clone->bi_end_io = clone_endio;

	clone->bi_private = tio;



	/*

	 * Map the clone.  If r == 0 we don't need to do
@@ -1522,7 +1522,6 @@ static int dm_rq_bio_constructor(struct bio *bio, struct bio *bio_orig, 
	info->orig = bio_orig;

	info->tio = tio;

	bio->bi_end_io = end_clone_bio;

	bio->bi_private = info;



	return 0;

}