Lock bitmap while joining the cluster

[mirror_ubuntu-artful-kernel.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3387f940140bcbdeb0ee8cba958cec0499c310dc..8f310d98f082e6a1e16d7e50d92d77f6e92cfee0 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5634,6 +5634,9 @@ static int get_array_info(struct mddev *mddev, void __user *arg)
                info.state = (1<<MD_SB_CLEAN);
        if (mddev->bitmap && mddev->bitmap_info.offset)
                info.state |= (1<<MD_SB_BITMAP_PRESENT);
+       if (mddev_is_clustered(mddev))
+               info.state |= (1<<MD_SB_CLUSTERED);
+
        info.active_disks  = insync;
        info.working_disks = working;
        info.failed_disks  = failed;
@@ -7274,7 +7277,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes)
        }
        spin_unlock(&pers_lock);
 
-       return md_cluster_ops->join(mddev);
+       return md_cluster_ops->join(mddev, nodes);
 }
 
 void md_cluster_stop(struct mddev *mddev)