p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dm: remove redundant mapped_device member from clone_info structure 

'struct dm_io' already has the same pointer.  So update all accesses
from ci->md to ci->io->md.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2017-12-14 16:30:42 -05:00
parent dde1e1ec4c
commit bc02cdbe53
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/md/dm.c
View File

@ -63,7 +63,6 @@ void dm_issue_global_event(void)
* One of these is allocated (on-stack) per original bio. * One of these is allocated (on-stack) per original bio.
*/ */
struct clone_info { struct clone_info {
struct mapped_device *md;
struct dm_table *map; struct dm_table *map;
struct bio *bio; struct bio *bio;
struct dm_io *io; struct dm_io *io;
@ -567,7 +566,7 @@ static struct dm_target_io *alloc_tio(struct clone_info *ci, struct dm_target *t
/* the dm_target_io embedded in ci->io is available */ /* the dm_target_io embedded in ci->io is available */
tio = &ci->io->tio; tio = &ci->io->tio;
} else { } else {
struct bio *clone = bio_alloc_bioset(gfp_mask, 0, ci->md->bs); struct bio *clone = bio_alloc_bioset(gfp_mask, 0, ci->io->md->bs);
if (!clone) if (!clone)
return NULL; return NULL;
@ -1298,7 +1297,7 @@ static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,
struct bio *bio; struct bio *bio;
if (try) if (try)
mutex_lock(&ci->md->table_devices_lock); mutex_lock(&ci->io->md->table_devices_lock);
for (bio_nr = 0; bio_nr < num_bios; bio_nr++) { for (bio_nr = 0; bio_nr < num_bios; bio_nr++) {
tio = alloc_tio(ci, ti, bio_nr, try ? GFP_NOIO : GFP_NOWAIT); tio = alloc_tio(ci, ti, bio_nr, try ? GFP_NOIO : GFP_NOWAIT);
if (!tio) if (!tio)
@ -1307,7 +1306,7 @@ static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,
bio_list_add(blist, &tio->clone); bio_list_add(blist, &tio->clone);
} }
if (try) if (try)
mutex_unlock(&ci->md->table_devices_lock); mutex_unlock(&ci->io->md->table_devices_lock);
if (bio_nr == num_bios) if (bio_nr == num_bios)
return; return;
@ -1500,7 +1499,6 @@ static void __split_and_process_bio(struct mapped_device *md,
} }
ci.map = map; ci.map = map;
ci.md = md;
ci.io = alloc_io(md); ci.io = alloc_io(md);
ci.io->status = 0; ci.io->status = 0;
atomic_set(&ci.io->io_count, 1); atomic_set(&ci.io->io_count, 1);
@ -1512,7 +1510,7 @@ static void __split_and_process_bio(struct mapped_device *md,
start_io_acct(ci.io); start_io_acct(ci.io);
if (bio->bi_opf & REQ_PREFLUSH) { if (bio->bi_opf & REQ_PREFLUSH) {
ci.bio = &ci.md->flush_bio; ci.bio = &ci.io->md->flush_bio;
ci.sector_count = 0; ci.sector_count = 0;
error = __send_empty_flush(&ci); error = __send_empty_flush(&ci);
/* dec_pending submits any data associated with flush */ /* dec_pending submits any data associated with flush */