From d0c996101a12e3fe3da10e9c4228b937dc9f4d30 Mon Sep 17 00:00:00 2001
From: Jonathan Brassow <jbrassow@redhat.com>
Date: Tue, 31 Jul 2012 10:03:52 +1000
Subject: [PATCH] --- yaml --- r: 320895 b: refs/heads/master c:
 0eaf822cb3dfcf2a64b2d27f4f6219186adb2695 h: refs/heads/master i:   320893:
 18ad4506675221d84a49645ccd7557c1492db4f8   320891:
 5d669cca78faa79275dce928fc07c7897dec8a74   320887:
 ac1670fd94df785b781cea416cb0639e90ecafdd   320879:
 0cacae9331b02a1c7f0f66152be06ca7ba3b0c90   320863:
 359590956a9d8ae29ba95c39ef49a499c8b7e34c   320831:
 c7b10f0a3ad275caeb5c325a04d6e1c50ecf58ab   320767:
 3d65167e220f08a59dc1cde9e617fe226e164c3b v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/md/raid1.c | 14 +++++++-------
 trunk/drivers/md/raid1.h |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ea6d768d28cc..bdcae0655153 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc280d987f039ef35ac1e59c09b7154b61f385cf
+refs/heads/master: 0eaf822cb3dfcf2a64b2d27f4f6219186adb2695
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index cacd008d6864..57d6abd497ef 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -873,7 +873,7 @@ static void alloc_behind_pages(struct bio *bio, struct r1bio *r1_bio)
 static void make_request(struct mddev *mddev, struct bio * bio)
 {
 	struct r1conf *conf = mddev->private;
-	struct mirror_info *mirror;
+	struct raid1_info *mirror;
 	struct r1bio *r1_bio;
 	struct bio *read_bio;
 	int i, disks;
@@ -1364,7 +1364,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
 	struct r1conf *conf = mddev->private;
 	int err = -EEXIST;
 	int mirror = 0;
-	struct mirror_info *p;
+	struct raid1_info *p;
 	int first = 0;
 	int last = conf->raid_disks - 1;
 	struct request_queue *q = bdev_get_queue(rdev->bdev);
@@ -1433,7 +1433,7 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)
 	struct r1conf *conf = mddev->private;
 	int err = 0;
 	int number = rdev->raid_disk;
-	struct mirror_info *p = conf->mirrors+ number;
+	struct raid1_info *p = conf->mirrors + number;
 
 	if (rdev != p->rdev)
 		p = conf->mirrors + conf->raid_disks + number;
@@ -2521,7 +2521,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
 {
 	struct r1conf *conf;
 	int i;
-	struct mirror_info *disk;
+	struct raid1_info *disk;
 	struct md_rdev *rdev;
 	int err = -ENOMEM;
 
@@ -2529,7 +2529,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
 	if (!conf)
 		goto abort;
 
-	conf->mirrors = kzalloc(sizeof(struct mirror_info)
+	conf->mirrors = kzalloc(sizeof(struct raid1_info)
 				* mddev->raid_disks * 2,
 				 GFP_KERNEL);
 	if (!conf->mirrors)
@@ -2798,7 +2798,7 @@ static int raid1_reshape(struct mddev *mddev)
 	 */
 	mempool_t *newpool, *oldpool;
 	struct pool_info *newpoolinfo;
-	struct mirror_info *newmirrors;
+	struct raid1_info *newmirrors;
 	struct r1conf *conf = mddev->private;
 	int cnt, raid_disks;
 	unsigned long flags;
@@ -2841,7 +2841,7 @@ static int raid1_reshape(struct mddev *mddev)
 		kfree(newpoolinfo);
 		return -ENOMEM;
 	}
-	newmirrors = kzalloc(sizeof(struct mirror_info) * raid_disks * 2,
+	newmirrors = kzalloc(sizeof(struct raid1_info) * raid_disks * 2,
 			     GFP_KERNEL);
 	if (!newmirrors) {
 		kfree(newpoolinfo);
diff --git a/trunk/drivers/md/raid1.h b/trunk/drivers/md/raid1.h
index 80ded139314c..6b49336575fe 100644
--- a/trunk/drivers/md/raid1.h
+++ b/trunk/drivers/md/raid1.h
@@ -1,7 +1,7 @@
 #ifndef _RAID1_H
 #define _RAID1_H
 
-struct mirror_info {
+struct raid1_info {
 	struct md_rdev	*rdev;
 	sector_t	head_position;
 };
@@ -24,7 +24,7 @@ struct pool_info {
 
 struct r1conf {
 	struct mddev		*mddev;
-	struct mirror_info	*mirrors;	/* twice 'raid_disks' to
+	struct raid1_info	*mirrors;	/* twice 'raid_disks' to
 						 * allow for replacements.
 						 */
 	int			raid_disks;