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

Commit 1e932a37 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by NeilBrown
Browse files

raid5-cache: take rdev->data_offset into account early on 



Set up bi_sector properly when we allocate an bio instead of updating it
at submission time.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent b349feb3

drivers/md/raid5-cache.c

+2 −5
Original line number Diff line number Diff line
@@ -269,12 +269,9 @@ static void r5l_submit_current_io(struct r5l_log *log) 
	__r5l_set_io_unit_state(io, IO_UNIT_IO_START);

	spin_unlock_irqrestore(&log->io_list_lock, flags);



	while ((bio = bio_list_pop(&io->bios))) {

		/* all IO must start from rdev->data_offset */

		bio->bi_iter.bi_sector += log->rdev->data_offset;

	while ((bio = bio_list_pop(&io->bios)))

		submit_bio(WRITE, bio);

}

}



static struct bio *r5l_bio_alloc(struct r5l_log *log, struct r5l_io_unit *io)

{
@@ -282,7 +279,7 @@ static struct bio *r5l_bio_alloc(struct r5l_log *log, struct r5l_io_unit *io) 


	bio->bi_rw = WRITE;

	bio->bi_bdev = log->rdev->bdev;

	bio->bi_iter.bi_sector = log->log_start;

	bio->bi_iter.bi_sector = log->rdev->data_offset + log->log_start;

	bio->bi_end_io = r5l_log_endio;

	bio->bi_private = io;