aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuoqing Jiang <gqjiang@suse.com>2017-10-24 03:11:53 -0400
committerShaohua Li <shli@fb.com>2017-11-02 00:32:25 -0400
commitf0e230ad877855567607fe2f40802b6317ad38f3 (patch)
treef8a0d05b421aec1b788eb6c58fbc5d873a561f59
parentfc33060ba0c78310f6398357ffca8f55a4c41cee (diff)
md-cluster: update document for raid10
Signed-off-by: Guoqing Jiang <gqjiang@suse.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--Documentation/md/md-cluster.txt3
-rw-r--r--drivers/md/Kconfig5
-rw-r--r--drivers/md/md-cluster.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/md/md-cluster.txt b/Documentation/md/md-cluster.txt
index 82ee51604e9a..e1055f105cf5 100644
--- a/Documentation/md/md-cluster.txt
+++ b/Documentation/md/md-cluster.txt
@@ -1,4 +1,5 @@
1The cluster MD is a shared-device RAID for a cluster. 1The cluster MD is a shared-device RAID for a cluster, it supports
2two levels: raid1 and raid10 (limited support).
2 3
3 4
41. On-disk format 51. On-disk format
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 4a249ee86364..83b9362be09c 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -178,7 +178,7 @@ config MD_FAULTY
178 178
179 179
180config MD_CLUSTER 180config MD_CLUSTER
181 tristate "Cluster Support for MD (EXPERIMENTAL)" 181 tristate "Cluster Support for MD"
182 depends on BLK_DEV_MD 182 depends on BLK_DEV_MD
183 depends on DLM 183 depends on DLM
184 default n 184 default n
@@ -188,7 +188,8 @@ config MD_CLUSTER
188 nodes in the cluster can access the MD devices simultaneously. 188 nodes in the cluster can access the MD devices simultaneously.
189 189
190 This brings the redundancy (and uptime) of RAID levels across the 190 This brings the redundancy (and uptime) of RAID levels across the
191 nodes of the cluster. 191 nodes of the cluster. Currently, it can work with raid1 and raid10
192 (limited support).
192 193
193 If unsure, say N. 194 If unsure, say N.
194 195
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index d0fd1bd8575c..79bfbc840385 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1478,7 +1478,7 @@ static struct md_cluster_operations cluster_ops = {
1478 1478
1479static int __init cluster_init(void) 1479static int __init cluster_init(void)
1480{ 1480{
1481 pr_warn("md-cluster: EXPERIMENTAL. Use with caution\n"); 1481 pr_warn("md-cluster: support raid1 and raid10 (limited support)\n");
1482 pr_info("Registering Cluster MD functions\n"); 1482 pr_info("Registering Cluster MD functions\n");
1483 register_md_cluster_operations(&cluster_ops, THIS_MODULE); 1483 register_md_cluster_operations(&cluster_ops, THIS_MODULE);
1484 return 0; 1484 return 0;