Commit fb56dfef authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by NeilBrown
Browse files

md: Export and rename kick_rdev_from_array 



This export is required for clustering module in order to
co-ordinate remove/readd a rdev from all nodes.

Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 8c58f02e

drivers/md/md.c

+9 −8
Original line number Diff line number Diff line
@@ -2168,11 +2168,12 @@ static void export_rdev(struct md_rdev *rdev) 
	kobject_put(&rdev->kobj);

}



static void kick_rdev_from_array(struct md_rdev *rdev)

void md_kick_rdev_from_array(struct md_rdev *rdev)

{

	unbind_rdev_from_array(rdev);

	export_rdev(rdev);

}

EXPORT_SYMBOL_GPL(md_kick_rdev_from_array);



static void export_array(struct mddev *mddev)

{
@@ -2181,7 +2182,7 @@ static void export_array(struct mddev *mddev) 
	while (!list_empty(&mddev->disks)) {

		rdev = list_first_entry(&mddev->disks, struct md_rdev,

					same_set);

		kick_rdev_from_array(rdev);

		md_kick_rdev_from_array(rdev);

	}

	mddev->raid_disks = 0;

	mddev->major_version = 0;
@@ -2476,7 +2477,7 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) 
			struct mddev *mddev = rdev->mddev;

			if (mddev_is_clustered(mddev))

				md_cluster_ops->metadata_update_start(mddev);

			kick_rdev_from_array(rdev);

			md_kick_rdev_from_array(rdev);

			if (mddev->pers)

				md_update_sb(mddev, 1);

			md_new_event(mddev);
@@ -3134,7 +3135,7 @@ static void analyze_sbs(struct mddev *mddev) 
				"md: fatal superblock inconsistency in %s"

				" -- removing from array\n",

				bdevname(rdev->bdev,b));

			kick_rdev_from_array(rdev);

			md_kick_rdev_from_array(rdev);

		}



	super_types[mddev->major_version].
@@ -3149,7 +3150,7 @@ static void analyze_sbs(struct mddev *mddev) 
			       "md: %s: %s: only %d devices permitted\n",

			       mdname(mddev), bdevname(rdev->bdev, b),

			       mddev->max_disks);

			kick_rdev_from_array(rdev);

			md_kick_rdev_from_array(rdev);

			continue;

		}

		if (rdev != freshest) {
@@ -3158,7 +3159,7 @@ static void analyze_sbs(struct mddev *mddev) 
				printk(KERN_WARNING "md: kicking non-fresh %s"

					" from array!\n",

					bdevname(rdev->bdev,b));

				kick_rdev_from_array(rdev);

				md_kick_rdev_from_array(rdev);

				continue;

			}

			/* No device should have a Candidate flag
@@ -3167,7 +3168,7 @@ static void analyze_sbs(struct mddev *mddev) 
			if (test_bit(Candidate, &rdev->flags)) {

				pr_info("md: kicking Cluster Candidate %s from array!\n",

					bdevname(rdev->bdev, b));

				kick_rdev_from_array(rdev);

				md_kick_rdev_from_array(rdev);

			}

		}

		if (mddev->level == LEVEL_MULTIPATH) {
@@ -5966,7 +5967,7 @@ static int hot_remove_disk(struct mddev *mddev, dev_t dev) 
	if (rdev->raid_disk >= 0)

		goto busy;



	kick_rdev_from_array(rdev);

	md_kick_rdev_from_array(rdev);

	md_update_sb(mddev, 1);

	md_new_event(mddev);

drivers/md/md.h

+1 −0
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, 
extern void md_unplug(struct blk_plug_cb *cb, bool from_schedule);

extern void md_reload_sb(struct mddev *mddev);

extern void md_update_sb(struct mddev *mddev, int force);

extern void md_kick_rdev_from_array(struct md_rdev * rdev);

static inline int mddev_check_plugged(struct mddev *mddev)

{

	return !!blk_check_plugged(md_unplug, mddev,