diff options
| author | Guoqing Jiang <gqjiang@suse.com> | 2015-12-21 00:51:00 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2016-01-06 01:39:10 +0100 |
| commit | 15858fa5b00c1067a8a8e53ea32f4a65f8bebbb8 (patch) | |
| tree | e44bdb5eba07e589d43ef66725d3d0dfa45c4f4d /drivers/md/md-cluster.c | |
| parent | md-cluster: update the documentation (diff) | |
| download | linux-15858fa5b00c1067a8a8e53ea32f4a65f8bebbb8.tar.xz linux-15858fa5b00c1067a8a8e53ea32f4a65f8bebbb8.zip | |
md-cluster: Defer MD reloading to mddev->thread
Reloading of superblock must be performed under reconfig_mutex. However,
this cannot be done with md_reload_sb because it would deadlock with
the message DLM lock. So, we defer it in md_check_recovery() which is
executed by mddev->thread.
This introduces a new flag, MD_RELOAD_SB, which if set, will reload the
superblock. And good_device_nr is also added to 'struct mddev' which is
used to get the num of the good device within cluster raid.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md/md-cluster.c')
| -rw-r--r-- | drivers/md/md-cluster.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index db9375f501ab..b659ef7b8daf 100644 --- a/drivers/md/md-cluster.c +++ b/drivers/md/md-cluster.c @@ -432,8 +432,10 @@ static void process_add_new_disk(struct mddev *mddev, struct cluster_msg *cmsg) static void process_metadata_update(struct mddev *mddev, struct cluster_msg *msg) { struct md_cluster_info *cinfo = mddev->cluster_info; - md_reload_sb(mddev, le32_to_cpu(msg->raid_slot)); + mddev->good_device_nr = le32_to_cpu(msg->raid_slot); + set_bit(MD_RELOAD_SB, &mddev->flags); dlm_lock_sync(cinfo->no_new_dev_lockres, DLM_LOCK_CR); + md_wakeup_thread(mddev->thread); } static void process_remove_disk(struct mddev *mddev, struct cluster_msg *msg) |