forked from pool/mdadm
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
|
From 4b74a905a67e0587ffa6f75d76eb8112e6aa8eed Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhilong Liu <zlliu@suse.com>
|
||
|
|
Date: Tue, 5 Sep 2017 17:41:36 +0800
|
||
|
|
Subject: [PATCH] mdadm/grow: Component size must be larger than chunk size
|
||
|
|
Git-commit: 4b74a905a67e0587ffa6f75d76eb8112e6aa8eed
|
||
|
|
Patch-mainline: mdadm-4.0+
|
||
|
|
References: bsc#1069165, bsc#1069167, bsc#1068030
|
||
|
|
|
||
|
|
Grow: Changing component size must be larger than current
|
||
|
|
chunk size against stripe raids, otherwise Grow_reshape()
|
||
|
|
would set s->size to '0'.
|
||
|
|
|
||
|
|
Signed-off-by: Zhilong Liu <zlliu@suse.com>
|
||
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
||
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
Grow.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Grow.c b/Grow.c
|
||
|
|
index 267b06f..bab1eec 100644
|
||
|
|
--- a/Grow.c
|
||
|
|
+++ b/Grow.c
|
||
|
|
@@ -1816,6 +1816,12 @@ int Grow_reshape(char *devname, int fd,
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (array.level > 1 &&
|
||
|
|
+ (array.chunk_size / 1024) > (int)s->size) {
|
||
|
|
+ pr_err("component size must be larger than chunk size.\n");
|
||
|
|
+ return 1;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
st = super_by_fd(fd, &subarray);
|
||
|
|
if (!st) {
|
||
|
|
pr_err("Unable to determine metadata format for %s\n", devname);
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|