iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm: add a clone_to_tio helper

Browse Source 
Add a helper to stop open coding the container_of operations to get
from the clone bio to the tio structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20220202160109.108149-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2022-02-02 17:00:58 +01:00 committed by Jens Axboe
parent c347a787e3
commit 6c23f0bd7f
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/md/dm.c
View File

@ -79,10 +79,14 @@ struct clone_info {
#define DM_IO_BIO_OFFSET \ #define DM_IO_BIO_OFFSET \
(offsetof(struct dm_target_io, clone) + offsetof(struct dm_io, tio)) (offsetof(struct dm_target_io, clone) + offsetof(struct dm_io, tio))
static inline struct dm_target_io *clone_to_tio(struct bio *clone)
{
return container_of(clone, struct dm_target_io, clone);
}
void *dm_per_bio_data(struct bio *bio, size_t data_size) void *dm_per_bio_data(struct bio *bio, size_t data_size)
{ {
struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); if (!clone_to_tio(bio)->inside_dm_io)
if (!tio->inside_dm_io)
return (char *)bio - DM_TARGET_IO_BIO_OFFSET - data_size; return (char *)bio - DM_TARGET_IO_BIO_OFFSET - data_size;
return (char *)bio - DM_IO_BIO_OFFSET - data_size; return (char *)bio - DM_IO_BIO_OFFSET - data_size;
} }
@ -477,10 +481,7 @@ out:
u64 dm_start_time_ns_from_clone(struct bio *bio) u64 dm_start_time_ns_from_clone(struct bio *bio)
{ {
struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); return jiffies_to_nsecs(clone_to_tio(bio)->io->start_time);
struct dm_io *io = tio->io;
return jiffies_to_nsecs(io->start_time);
} }
EXPORT_SYMBOL_GPL(dm_start_time_ns_from_clone); EXPORT_SYMBOL_GPL(dm_start_time_ns_from_clone);
@ -521,7 +522,7 @@ static struct dm_io *alloc_io(struct mapped_device *md, struct bio *bio)
clone = bio_alloc_bioset(NULL, 0, 0, GFP_NOIO, &md->io_bs); clone = bio_alloc_bioset(NULL, 0, 0, GFP_NOIO, &md->io_bs);
tio = container_of(clone, struct dm_target_io, clone); tio = clone_to_tio(clone);
tio->inside_dm_io = true; tio->inside_dm_io = true;
tio->io = NULL; tio->io = NULL;
@ -557,7 +558,7 @@ static struct dm_target_io *alloc_tio(struct clone_info *ci, struct dm_target *t
if (!clone) if (!clone)
return NULL; return NULL;
tio = container_of(clone, struct dm_target_io, clone); tio = clone_to_tio(clone);
tio->inside_dm_io = false; tio->inside_dm_io = false;
} }
@ -878,7 +879,7 @@ static bool swap_bios_limit(struct dm_target *ti, struct bio *bio)
static void clone_endio(struct bio *bio) static void clone_endio(struct bio *bio)
{ {
blk_status_t error = bio->bi_status; blk_status_t error = bio->bi_status;
struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); struct dm_target_io *tio = clone_to_tio(bio);
struct dm_io *io = tio->io; struct dm_io *io = tio->io;
struct mapped_device *md = tio->io->md; struct mapped_device *md = tio->io->md;
dm_endio_fn endio = tio->ti->type->end_io; dm_endio_fn endio = tio->ti->type->end_io;
@ -1084,7 +1085,7 @@ static int dm_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff,
*/ */
void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors) void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors)
{ {
struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone); struct dm_target_io *tio = clone_to_tio(bio);
unsigned bi_size = bio->bi_iter.bi_size >> SECTOR_SHIFT; unsigned bi_size = bio->bi_iter.bi_size >> SECTOR_SHIFT;
BUG_ON(bio->bi_opf & REQ_PREFLUSH); BUG_ON(bio->bi_opf & REQ_PREFLUSH);
@ -1257,10 +1258,8 @@ static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,
if (bio_nr == num_bios) if (bio_nr == num_bios)
return; return;
while ((bio = bio_list_pop(blist))) { while ((bio = bio_list_pop(blist)))
tio = container_of(bio, struct dm_target_io, clone); free_tio(clone_to_tio(bio));
free_tio(tio);
}
} }
} }
@ -1282,14 +1281,11 @@ static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti,
{ {
struct bio_list blist = BIO_EMPTY_LIST; struct bio_list blist = BIO_EMPTY_LIST;
struct bio *bio; struct bio *bio;
struct dm_target_io *tio;
alloc_multiple_bios(&blist, ci, ti, num_bios); alloc_multiple_bios(&blist, ci, ti, num_bios);
while ((bio = bio_list_pop(&blist))) { while ((bio = bio_list_pop(&blist)))
tio = container_of(bio, struct dm_target_io, clone); __clone_and_map_simple_bio(ci, clone_to_tio(bio), len);
__clone_and_map_simple_bio(ci, tio, len);
}
} }
static int __send_empty_flush(struct clone_info *ci) static int __send_empty_flush(struct clone_info *ci)