]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
dm raid1: rename read_record to bio_record
authorMikulas Patocka <mpatocka@redhat.com>
Fri, 21 Dec 2012 20:23:39 +0000 (20:23 +0000)
committerAlasdair G Kergon <agk@redhat.com>
Fri, 21 Dec 2012 20:23:39 +0000 (20:23 +0000)
Rename struct read_record to bio_record in dm-raid1.

In the following patch, the structure will be used for both read and
write bios, so rename it.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
drivers/md/dm-raid1.c

index b4bc287bea7e2fb6bf3255b327e6eff1598ea07c..a7d0d8a4bbdf37e8151d134718385b2241e3f6bc 100644 (file)
@@ -138,7 +138,7 @@ static void dispatch_bios(void *context, struct bio_list *bio_list)
                queue_bio(ms, bio, WRITE);
 }
 
-struct dm_raid1_read_record {
+struct dm_raid1_bio_record {
        struct mirror *m;
        struct dm_bio_details details;
 };
@@ -1072,7 +1072,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        ti->num_flush_requests = 1;
        ti->num_discard_requests = 1;
-       ti->per_bio_data_size = sizeof(struct dm_raid1_read_record);
+       ti->per_bio_data_size = sizeof(struct dm_raid1_bio_record);
        ti->discard_zeroes_data_unsupported = true;
 
        ms->kmirrord_wq = alloc_workqueue("kmirrord",
@@ -1146,7 +1146,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
        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) {
@@ -1179,10 +1179,10 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
        if (unlikely(!m))
                return -EIO;
 
-       read_record = dm_per_bio_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_per_bio_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);
 
@@ -1196,7 +1196,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
        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.
@@ -1214,7 +1214,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                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
@@ -1224,7 +1224,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                        return -EIO;
                }
 
-               m = read_record->m;
+               m = bio_record->m;
 
                DMERR("Mirror read failed from %s. Trying alternative device.",
                      m->dev->name);
@@ -1236,7 +1236,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                 * 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;