From: Christoph Hellwig Date: Mon, 5 Oct 2015 07:31:12 +0000 (+0200) Subject: raid5-cache: take rdev->data_offset into account early on X-Git-Tag: firefly_0821_release~176^2~806^2~13 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e932a37ccb9ad1984823dead4b48902fc5789f4;p=firefly-linux-kernel-4.4.55.git 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: Christoph Hellwig Signed-off-by: NeilBrown --- diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c index 59a4640f09e5..2ac93fbc31eb 100644 --- a/drivers/md/raid5-cache.c +++ b/drivers/md/raid5-cache.c @@ -269,11 +269,8 @@ 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;