Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8321b68 authored by NeilBrown's avatar NeilBrown
Browse files

md: change hot_remove_disk to take an rdev rather than a number. 



Soon an array will be able to have multiple devices with the
same raid_disk number (an original and a replacement).  So removing
a device based on the number won't work.  So pass the actual device
handle instead.

Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 476a7abb

drivers/md/md.c

+3 −3
Original line number Diff line number Diff line
@@ -2689,7 +2689,7 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len) 
		if (rdev->mddev->pers->hot_remove_disk == NULL)

			return -EINVAL;

		err = rdev->mddev->pers->

			hot_remove_disk(rdev->mddev, rdev->raid_disk);

			hot_remove_disk(rdev->mddev, rdev);

		if (err)

			return err;

		sysfs_unlink_rdev(rdev->mddev, rdev);
@@ -7340,7 +7340,7 @@ static int remove_and_add_spares(struct mddev *mddev) 
		     ! test_bit(In_sync, &rdev->flags)) &&

		    atomic_read(&rdev->nr_pending)==0) {

			if (mddev->pers->hot_remove_disk(

				    mddev, rdev->raid_disk)==0) {

				    mddev, rdev) == 0) {

				sysfs_unlink_rdev(mddev, rdev);

				rdev->raid_disk = -1;

			}
@@ -7477,7 +7477,7 @@ void md_check_recovery(struct mddev *mddev) 
				    test_bit(Faulty, &rdev->flags) &&

				    atomic_read(&rdev->nr_pending)==0) {

					if (mddev->pers->hot_remove_disk(

						    mddev, rdev->raid_disk)==0) {

						    mddev, rdev) == 0) {

						sysfs_unlink_rdev(mddev, rdev);

						rdev->raid_disk = -1;

					}

drivers/md/md.h

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ struct md_personality 
	 */

	void (*error_handler)(struct mddev *mddev, struct md_rdev *rdev);

	int (*hot_add_disk) (struct mddev *mddev, struct md_rdev *rdev);

	int (*hot_remove_disk) (struct mddev *mddev, int number);

	int (*hot_remove_disk) (struct mddev *mddev, struct md_rdev *rdev);

	int (*spare_active) (struct mddev *mddev);

	sector_t (*sync_request)(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster);

	int (*resize) (struct mddev *mddev, sector_t sectors);

drivers/md/multipath.c

+3 −4
Original line number Diff line number Diff line
@@ -292,17 +292,16 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
	return err;

}



static int multipath_remove_disk(struct mddev *mddev, int number)

static int multipath_remove_disk(struct mddev *mddev, struct md_rdev *rdev)

{

	struct mpconf *conf = mddev->private;

	int err = 0;

	struct md_rdev *rdev;

	int number = rdev->raid_disk;

	struct multipath_info *p = conf->multipaths + number;



	print_multipath_conf(conf);



	rdev = p->rdev;

	if (rdev) {

	if (rdev == p->rdev) {

		if (test_bit(In_sync, &rdev->flags) ||

		    atomic_read(&rdev->nr_pending)) {

			printk(KERN_ERR "hot-remove-disk, slot %d is identified"

drivers/md/raid1.c

+3 −4
Original line number Diff line number Diff line
@@ -1327,16 +1327,15 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
	return err;

}



static int raid1_remove_disk(struct mddev *mddev, int number)

static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)

{

	struct r1conf *conf = mddev->private;

	int err = 0;

	struct md_rdev *rdev;

	int number = rdev->raid_disk;

	struct mirror_info *p = conf->mirrors+ number;



	print_conf(conf);

	rdev = p->rdev;

	if (rdev) {

	if (rdev == p->rdev) {

		if (test_bit(In_sync, &rdev->flags) ||

		    atomic_read(&rdev->nr_pending)) {

			err = -EBUSY;

drivers/md/raid10.c

+3 −4
Original line number Diff line number Diff line
@@ -1385,16 +1385,15 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
	return err;

}



static int raid10_remove_disk(struct mddev *mddev, int number)

static int raid10_remove_disk(struct mddev *mddev, struct md_rdev *rdev)

{

	struct r10conf *conf = mddev->private;

	int err = 0;

	struct md_rdev *rdev;

	int number = rdev->raid_disk;

	struct mirror_info *p = conf->mirrors+ number;



	print_conf(conf);

	rdev = p->rdev;

	if (rdev) {

	if (rdev == p->rdev) {

		if (test_bit(In_sync, &rdev->flags) ||

		    atomic_read(&rdev->nr_pending)) {

			err = -EBUSY;