dm-raid1: rename read_record to bio_record In the following patch, the structure will be used for both read and write bios, so rename it. Signed-off-by: Mikulas Patocka --- drivers/md/dm-raid1.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) Index: linux-3.6.6-fast/drivers/md/dm-raid1.c =================================================================== --- linux-3.6.6-fast.orig/drivers/md/dm-raid1.c 2012-11-15 00:46:05.000000000 +0100 +++ linux-3.6.6-fast/drivers/md/dm-raid1.c 2012-11-15 00:46:19.000000000 +0100 @@ -141,7 +141,7 @@ static void dispatch_bios(void *context, queue_bio(ms, bio, WRITE); } -struct dm_raid1_read_record { +struct dm_raid1_bio_record { struct mirror *m; struct dm_bio_details details; }; @@ -1075,7 +1075,7 @@ static int mirror_ctr(struct dm_target * ti->num_flush_requests = 1; ti->num_discard_requests = 1; - ti->per_request_data = sizeof(struct dm_raid1_read_record); + ti->per_request_data = sizeof(struct dm_raid1_bio_record); ti->discard_zeroes_data_unsupported = true; ms->kmirrord_wq = alloc_workqueue("kmirrord", @@ -1149,7 +1149,7 @@ static int mirror_map(struct dm_target * int r, rw = bio_rw(bio); struct mirror *m; struct mirror_set *ms = ti->private; - struct dm_raid1_read_record *read_record; + struct dm_raid1_bio_record *bio_record; struct dm_dirty_log *log = dm_rh_dirty_log(ms->rh); if (rw == WRITE) { @@ -1182,10 +1182,10 @@ static int mirror_map(struct dm_target * if (unlikely(!m)) return -EIO; - read_record = dm_bio_get_per_request_data(bio, sizeof(struct dm_raid1_read_record)); - dm_bio_record(&read_record->details, bio); - map_context->ptr = read_record; - read_record->m = m; + bio_record = dm_bio_get_per_request_data(bio, sizeof(struct dm_raid1_bio_record)); + dm_bio_record(&bio_record->details, bio); + map_context->ptr = bio_record; + bio_record->m = m; map_bio(m, bio); @@ -1199,7 +1199,7 @@ static int mirror_end_io(struct dm_targe struct mirror_set *ms = (struct mirror_set *) ti->private; struct mirror *m = NULL; struct dm_bio_details *bd = NULL; - struct dm_raid1_read_record *read_record = map_context->ptr; + struct dm_raid1_bio_record *bio_record = map_context->ptr; /* * We need to dec pending if this was a write. @@ -1217,7 +1217,7 @@ static int mirror_end_io(struct dm_targe goto out; if (unlikely(error)) { - if (!read_record) { + if (!bio_record) { /* * There wasn't enough memory to record necessary * information for a retry or there was no other @@ -1227,7 +1227,7 @@ static int mirror_end_io(struct dm_targe return -EIO; } - m = read_record->m; + m = bio_record->m; DMERR("Mirror read failed from %s. Trying alternative device.", m->dev->name); @@ -1239,7 +1239,7 @@ static int mirror_end_io(struct dm_targe * mirror. */ if (default_ok(m) || mirror_available(ms, bio)) { - bd = &read_record->details; + bd = &bio_record->details; dm_bio_restore(bd, bio); map_context->ptr = NULL;