Skip to content

L
linux
Commit f39afb82 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds
Browse files
Options

[PATCH] md: Remove used_slot field from per-personality info 

This is equivalent to ->rdev != NULL, so it isn't needed.
parent 3e98f2fb
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 58 deletions
drivers/md/multipath.c
View file @ f39afb82
...@@ -288,11 +288,10 @@ static void print_multipath_conf (multipath_conf_t *conf) ...@@ -288,11 +288,10 @@ static void print_multipath_conf (multipath_conf_t *conf)
for (i = 0; i < MD_SB_DISKS; i++) { for (i = 0; i < MD_SB_DISKS; i++) {
tmp = conf->multipaths + i; tmp = conf->multipaths + i;
if (tmp->operational || tmp->used_slot) if (tmp->rdev)
printk(" disk%d, o:%d, us:%d dev:%s\n", printk(" disk%d, o:%d, dev:%s\n",
i,tmp->operational, i,tmp->operational,
tmp->used_slot, bdev_partition_name(tmp->rdev->bdev));
bdev_partition_name(tmp->rdev->bdev));
} }
} }
...@@ -305,10 +304,9 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) ...@@ -305,10 +304,9 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
print_multipath_conf(conf); print_multipath_conf(conf);
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
if (!p->used_slot) { if (!p->rdev) {
p->rdev = rdev; p->rdev = rdev;
p->operational = 1; p->operational = 1;
p->used_slot = 1;
conf->working_disks++; conf->working_disks++;
err = 0; err = 0;
} }
...@@ -329,7 +327,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number) ...@@ -329,7 +327,7 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
print_multipath_conf(conf); print_multipath_conf(conf);
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
if (p->used_slot) { if (p->rdev) {
if (p->operational || if (p->operational ||
(p->rdev && atomic_read(&p->rdev->nr_pending))) { (p->rdev && atomic_read(&p->rdev->nr_pending))) {
printk(KERN_ERR "hot-remove-disk, slot %d is identified but is still operational!\n", number); printk(KERN_ERR "hot-remove-disk, slot %d is identified but is still operational!\n", number);
...@@ -337,7 +335,6 @@ static int multipath_remove_disk(mddev_t *mddev, int number) ...@@ -337,7 +335,6 @@ static int multipath_remove_disk(mddev_t *mddev, int number)
goto abort; goto abort;
} }
p->rdev = NULL; p->rdev = NULL;
p->used_slot = 0;
err = 0; err = 0;
} }
if (err) if (err)
...@@ -497,7 +494,6 @@ static int multipath_run (mddev_t *mddev) ...@@ -497,7 +494,6 @@ static int multipath_run (mddev_t *mddev)
*/ */
disk->rdev = rdev; disk->rdev = rdev;
disk->operational = 1; disk->operational = 1;
disk->used_slot = 1;
num_rdevs++; num_rdevs++;
} }
......
drivers/md/raid1.c
View file @ f39afb82
...@@ -652,10 +652,10 @@ static void print_conf(conf_t *conf) ...@@ -652,10 +652,10 @@ static void print_conf(conf_t *conf)
for (i = 0; i < MD_SB_DISKS; i++) { for (i = 0; i < MD_SB_DISKS; i++) {
tmp = conf->mirrors + i; tmp = conf->mirrors + i;
printk(" disk %d, s:%d, o:%d, us:%d dev:%s\n", if (tmp->rdev)
i, tmp->spare, tmp->operational, printk(" disk %d, s:%d, o:%d, dev:%s\n",
tmp->used_slot, i, tmp->spare, tmp->operational,
bdev_partition_name(tmp->rdev->bdev)); bdev_partition_name(tmp->rdev->bdev));
} }
} }
...@@ -690,7 +690,7 @@ static int raid1_spare_active(mddev_t *mddev) ...@@ -690,7 +690,7 @@ static int raid1_spare_active(mddev_t *mddev)
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
tmp = conf->mirrors + i; tmp = conf->mirrors + i;
if ((!tmp->operational && !tmp->spare) || if ((!tmp->operational && !tmp->spare) ||
!tmp->used_slot) { !tmp->rdev) {
failed_disk = i; failed_disk = i;
break; break;
} }
...@@ -740,8 +740,6 @@ static int raid1_spare_active(mddev_t *mddev) ...@@ -740,8 +740,6 @@ static int raid1_spare_active(mddev_t *mddev)
* disk. (this means we switch back these values) * disk. (this means we switch back these values)
*/ */
if (!sdisk->rdev)
sdisk->used_slot = 0;
/* /*
* this really activates the spare. * this really activates the spare.
*/ */
...@@ -813,12 +811,11 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) ...@@ -813,12 +811,11 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
print_conf(conf); print_conf(conf);
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
if (!p->used_slot) { if (!p->rdev) {
p->rdev = rdev; p->rdev = rdev;
p->operational = 0; p->operational = 0;
p->write_only = 0; p->write_only = 0;
p->spare = 1; p->spare = 1;
p->used_slot = 1;
p->head_position = 0; p->head_position = 0;
err = 0; err = 0;
} }
...@@ -838,14 +835,13 @@ static int raid1_remove_disk(mddev_t *mddev, int number) ...@@ -838,14 +835,13 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
print_conf(conf); print_conf(conf);
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
if (p->used_slot) { if (p->rdev) {
if (p->operational || if (p->operational ||
(p->rdev && atomic_read(&p->rdev->nr_pending))) { (p->rdev && atomic_read(&p->rdev->nr_pending))) {
err = -EBUSY; err = -EBUSY;
goto abort; goto abort;
} }
p->rdev = NULL; p->rdev = NULL;
p->used_slot = 0;
err = 0; err = 0;
} }
if (err) if (err)
...@@ -1265,7 +1261,6 @@ static int run(mddev_t *mddev) ...@@ -1265,7 +1261,6 @@ static int run(mddev_t *mddev)
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 0; disk->spare = 0;
disk->used_slot = 1;
disk->head_position = 0; disk->head_position = 0;
continue; continue;
} }
...@@ -1282,7 +1277,6 @@ static int run(mddev_t *mddev) ...@@ -1282,7 +1277,6 @@ static int run(mddev_t *mddev)
disk->operational = 1; disk->operational = 1;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 0; disk->spare = 0;
disk->used_slot = 1;
disk->head_position = 0; disk->head_position = 0;
conf->working_disks++; conf->working_disks++;
} else { } else {
...@@ -1294,7 +1288,6 @@ static int run(mddev_t *mddev) ...@@ -1294,7 +1288,6 @@ static int run(mddev_t *mddev)
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 1; disk->spare = 1;
disk->used_slot = 1;
disk->head_position = 0; disk->head_position = 0;
} }
} }
...@@ -1316,16 +1309,13 @@ static int run(mddev_t *mddev) ...@@ -1316,16 +1309,13 @@ static int run(mddev_t *mddev)
disk = conf->mirrors + i; disk = conf->mirrors + i;
if (!disk->used_slot) { if (!disk->rdev) {
disk->rdev = NULL;
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 0; disk->spare = 0;
disk->used_slot = 1;
disk->head_position = 0; disk->head_position = 0;
}
if (!disk->used_slot)
mddev->degraded++; mddev->degraded++;
}
} }
/* /*
......
drivers/md/raid5.c
View file @ f39afb82
...@@ -1423,7 +1423,6 @@ static int run (mddev_t *mddev) ...@@ -1423,7 +1423,6 @@ static int run (mddev_t *mddev)
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 0; disk->spare = 0;
disk->used_slot = 1;
continue; continue;
} }
if (rdev->in_sync) { if (rdev->in_sync) {
...@@ -1435,7 +1434,6 @@ static int run (mddev_t *mddev) ...@@ -1435,7 +1434,6 @@ static int run (mddev_t *mddev)
disk->rdev = rdev; disk->rdev = rdev;
disk->operational = 1; disk->operational = 1;
disk->used_slot = 1;
conf->working_disks++; conf->working_disks++;
} else { } else {
...@@ -1448,20 +1446,16 @@ static int run (mddev_t *mddev) ...@@ -1448,20 +1446,16 @@ static int run (mddev_t *mddev)
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 1; disk->spare = 1;
disk->used_slot = 1;
} }
} }
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
disk = conf->disks + i; disk = conf->disks + i;
if (!disk->used_slot) { if (!disk->rdev) {
disk->rdev = NULL;
disk->operational = 0; disk->operational = 0;
disk->write_only = 0; disk->write_only = 0;
disk->spare = 0; disk->spare = 0;
disk->used_slot = 1;
} }
} }
...@@ -1476,14 +1470,6 @@ static int run (mddev_t *mddev) ...@@ -1476,14 +1470,6 @@ static int run (mddev_t *mddev)
conf->algorithm = mddev->layout; conf->algorithm = mddev->layout;
conf->max_nr_stripes = NR_STRIPES; conf->max_nr_stripes = NR_STRIPES;
#if 0
for (i = 0; i < conf->raid_disks; i++) {
if (!conf->disks[i].used_slot) {
MD_BUG();
goto abort;
}
}
#endif
if (!conf->chunk_size || conf->chunk_size % 4) { if (!conf->chunk_size || conf->chunk_size % 4) {
printk(KERN_ERR "raid5: invalid chunk size %d for md%d\n", conf->chunk_size, mdidx(mddev)); printk(KERN_ERR "raid5: invalid chunk size %d for md%d\n", conf->chunk_size, mdidx(mddev));
goto abort; goto abort;
...@@ -1634,9 +1620,9 @@ static void print_raid5_conf (raid5_conf_t *conf) ...@@ -1634,9 +1620,9 @@ static void print_raid5_conf (raid5_conf_t *conf)
for (i = 0; i < conf->working_disks+conf->failed_disks; i++) { for (i = 0; i < conf->working_disks+conf->failed_disks; i++) {
#endif #endif
tmp = conf->disks + i; tmp = conf->disks + i;
printk(" disk %d, s:%d, o:%d, us:%d dev:%s\n", if (tmp->rdev)
printk(" disk %d, s:%d, o:%d, dev:%s\n",
i, tmp->spare,tmp->operational, i, tmp->spare,tmp->operational,
tmp->used_slot,
bdev_partition_name(tmp->rdev->bdev)); bdev_partition_name(tmp->rdev->bdev));
} }
} }
...@@ -1654,7 +1640,7 @@ static int raid5_spare_active(mddev_t *mddev) ...@@ -1654,7 +1640,7 @@ static int raid5_spare_active(mddev_t *mddev)
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
tmp = conf->disks + i; tmp = conf->disks + i;
if ((!tmp->operational && !tmp->spare) || if ((!tmp->operational && !tmp->spare) ||
!tmp->used_slot) { !tmp->rdev) {
failed_disk = i; failed_disk = i;
break; break;
} }
...@@ -1704,9 +1690,6 @@ static int raid5_spare_active(mddev_t *mddev) ...@@ -1704,9 +1690,6 @@ static int raid5_spare_active(mddev_t *mddev)
* disk. (this means we switch back these values) * disk. (this means we switch back these values)
*/ */
if (!sdisk->rdev)
sdisk->used_slot = 0;
/* /*
* this really activates the spare. * this really activates the spare.
*/ */
...@@ -1782,14 +1765,13 @@ static int raid5_remove_disk(mddev_t *mddev, int number) ...@@ -1782,14 +1765,13 @@ static int raid5_remove_disk(mddev_t *mddev, int number)
print_raid5_conf(conf); print_raid5_conf(conf);
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
if (p->used_slot) { if (p->rdev) {
if (p->operational || if (p->operational ||
atomic_read(&p->rdev->nr_pending)) { atomic_read(&p->rdev->nr_pending)) {
err = -EBUSY; err = -EBUSY;
goto abort; goto abort;
} }
p->rdev = NULL; p->rdev = NULL;
p->used_slot = 0;
err = 0; err = 0;
} }
if (err) if (err)
...@@ -1812,13 +1794,12 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) ...@@ -1812,13 +1794,12 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
* find the disk ... * find the disk ...
*/ */
if (!p->used_slot) { if (!p->rdev) {
/* it will be held open by rdev */ /* it will be held open by rdev */
p->rdev = rdev; p->rdev = rdev;
p->operational = 0; p->operational = 0;
p->write_only = 0; p->write_only = 0;
p->spare = 1; p->spare = 1;
p->used_slot = 1;
err = 0; err = 0;
} }
if (err) if (err)
......
include/linux/raid/multipath.h
View file @ f39afb82
...@@ -11,8 +11,6 @@ struct multipath_info { ...@@ -11,8 +11,6 @@ struct multipath_info {
* State bits: * State bits:
*/ */
int operational; int operational;
int used_slot;
}; };
struct multipath_private_data { struct multipath_private_data {
......
include/linux/raid/raid1.h
View file @ f39afb82
...@@ -15,8 +15,6 @@ struct mirror_info { ...@@ -15,8 +15,6 @@ struct mirror_info {
int operational; int operational;
int write_only; int write_only;
int spare; int spare;
int used_slot;
}; };
typedef struct r1bio_s r1bio_t; typedef struct r1bio_s r1bio_t;
......
include/linux/raid/raid5.h
View file @ f39afb82
...@@ -196,7 +196,6 @@ struct disk_info { ...@@ -196,7 +196,6 @@ struct disk_info {
int operational; int operational;
int write_only; int write_only;
int spare; int spare;
int used_slot;
}; };
struct raid5_private_data { struct raid5_private_data {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7