@@ -1565,10 +1565,12 @@ static void dm_split_and_process_bio(struct mapped_device *md,
1565
1565
struct dm_table * map , struct bio * bio )
1566
1566
{
1567
1567
struct clone_info ci ;
1568
+ struct dm_io * io ;
1568
1569
struct bio * orig_bio = NULL ;
1569
1570
blk_status_t error = BLK_STS_OK ;
1570
1571
1571
1572
init_clone_info (& ci , md , map , bio );
1573
+ io = ci .io ;
1572
1574
1573
1575
if (bio -> bi_opf & REQ_PREFLUSH ) {
1574
1576
__send_empty_flush (& ci );
@@ -1577,14 +1579,14 @@ static void dm_split_and_process_bio(struct mapped_device *md,
1577
1579
}
1578
1580
1579
1581
error = __split_and_process_bio (& ci );
1580
- ci . io -> map_task = NULL ;
1582
+ io -> map_task = NULL ;
1581
1583
if (error || !ci .sector_count )
1582
1584
goto out ;
1583
1585
1584
1586
/*
1585
1587
* Remainder must be passed to submit_bio_noacct() so it gets handled
1586
1588
* *after* bios already submitted have been completely processed.
1587
- * We take a clone of the original to store in ci. io->orig_bio to be
1589
+ * We take a clone of the original to store in io->orig_bio to be
1588
1590
* used by dm_end_io_acct() and for dm_io_complete() to use for
1589
1591
* completion handling.
1590
1592
*/
@@ -1596,9 +1598,9 @@ static void dm_split_and_process_bio(struct mapped_device *md,
1596
1598
out :
1597
1599
if (!orig_bio )
1598
1600
orig_bio = bio ;
1599
- smp_store_release (& ci . io -> orig_bio , orig_bio );
1600
- if (dm_io_flagged (ci . io , DM_IO_START_ACCT ))
1601
- dm_start_io_acct (ci . io , NULL );
1601
+ smp_store_release (& io -> orig_bio , orig_bio );
1602
+ if (dm_io_flagged (io , DM_IO_START_ACCT ))
1603
+ dm_start_io_acct (io , NULL );
1602
1604
1603
1605
/*
1604
1606
* Drop the extra reference count for non-POLLED bio, and hold one
@@ -1610,7 +1612,7 @@ static void dm_split_and_process_bio(struct mapped_device *md,
1610
1612
if (error || !ci .submit_as_polled )
1611
1613
dm_io_dec_pending (ci .io , error );
1612
1614
else
1613
- dm_queue_poll_io (bio , ci . io );
1615
+ dm_queue_poll_io (bio , io );
1614
1616
}
1615
1617
1616
1618
static void dm_submit_bio (struct bio * bio )
0 commit comments