[PATCH] MD - nr_disks is gone from multipath/raid1

nr_disks is gone from multipath/raid1

Never used.

drivers/md/multipath.c

@@ -274,8 +274,8 @@ static void print_multipath_conf (multipath_conf_t *conf)
 		printk("(conf==NULL)\n");
 		return;
 	}
-	printk(" --- wd:%d rd:%d nd:%d\n", conf->working_disks,
-			 conf->raid_disks, conf->nr_disks);
+	printk(" --- wd:%d rd:%d\n", conf->working_disks,
+			 conf->raid_disks);
 
 	for (i = 0; i < MD_SB_DISKS; i++) {
 		tmp = conf->multipaths + i;
@@ -303,7 +303,6 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
 		p->bdev = rdev->bdev;
 		p->operational = 1;
 		p->used_slot = 1;
-		conf->nr_disks++;
 		conf->working_disks++;
 		err = 0;
 	}
@@ -332,7 +331,6 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
 		}
 		p->bdev = NULL;
 		p->used_slot = 0;
-		conf->nr_disks--;
 		err = 0;
 	}
 	if (err)
@@ -500,7 +498,6 @@ static int multipath_run (mddev_t *mddev)
 	}
 
 	conf->raid_disks = sb->raid_disks = num_rdevs;
-	conf->nr_disks = num_rdevs;
 	mddev->sb_dirty = 1;
 	conf->mddev = mddev;
 	conf->device_lock = SPIN_LOCK_UNLOCKED;

drivers/md/raid1.c

@@ -625,8 +625,8 @@ static void print_conf(conf_t *conf)
 		printk("(!conf)\n");
 		return;
 	}
-	printk(" --- wd:%d rd:%d nd:%d\n", conf->working_disks,
-			conf->raid_disks, conf->nr_disks);
+	printk(" --- wd:%d rd:%d\n", conf->working_disks,
+			conf->raid_disks);
 
 	for (i = 0; i < MD_SB_DISKS; i++) {
 		tmp = conf->mirrors + i;
@@ -803,7 +803,6 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
 		p->spare = 1;
 		p->used_slot = 1;
 		p->head_position = 0;
-		conf->nr_disks++;
 		err = 0;
 	}
 	if (err)
@@ -829,7 +828,6 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
 		}
 		p->bdev = NULL;
 		p->used_slot = 0;
-		conf->nr_disks--;
 		err = 0;
 	}
 	if (err)
@@ -1279,7 +1277,6 @@ static int run(mddev_t *mddev)
 		}
 	}
 	conf->raid_disks = sb->raid_disks;
-	conf->nr_disks = sb->nr_disks;
 	conf->mddev = mddev;
 	conf->device_lock = SPIN_LOCK_UNLOCKED;
 

include/linux/raid/multipath.h

@@ -20,7 +20,6 @@ struct multipath_info {
 struct multipath_private_data {
 	mddev_t			*mddev;
 	struct multipath_info	multipaths[MD_SB_DISKS];
-	int			nr_disks;
 	int			raid_disks;
 	int			working_disks;
 	mdk_thread_t		*thread;

include/linux/raid/raid1.h

@@ -27,7 +27,6 @@ typedef struct r1bio_s r1bio_t;
 struct r1_private_data_s {
 	mddev_t			*mddev;
 	mirror_info_t		mirrors[MD_SB_DISKS];
-	int			nr_disks;
 	int			raid_disks;
 	int			working_disks;
 	int			last_used;