linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4] super1: fix sb->max_dev when adding a new disk in linear array
@ 2017-05-22  6:16 Lidong Zhong
  2017-05-22 11:07 ` NeilBrown
  0 siblings, 1 reply; 6+ messages in thread
From: Lidong Zhong @ 2017-05-22  6:16 UTC (permalink / raw)
  To: linux-raid, neilb; +Cc: colyli, Jes.Sorensen

The value of sb->max_dev will always be increased by 1 when adding
a new disk in linear array. It causes an inconsistence between each
disk in the array and the "Array State" value of "mdadm --examine DISK"
is wrong. For example, when adding the first new disk into linear array
it will be:

Array State : RAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
('A' == active, '.' == missing, 'R' == replacing)

Adding the second disk into linear array it will be

Array State : .AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
('A' == active, '.' == missing, 'R' == replacing)

Signed-off-by: Lidong Zhong <lzhong@suse.com>
---
 super1.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/super1.c b/super1.c
index 2fcb814..03cea72 100644
--- a/super1.c
+++ b/super1.c
@@ -1267,8 +1267,10 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
 				break;
 		sb->dev_number = __cpu_to_le32(i);
 		info->disk.number = i;
-		if (max >= __le32_to_cpu(sb->max_dev))
+		if (i >= max) {
+			sb->dev_roles[max] = __cpu_to_le16(MD_DISK_ROLE_SPARE);
 			sb->max_dev = __cpu_to_le32(max+1);
+		}
 
 		random_uuid(sb->device_uuid);
 
@@ -1293,9 +1295,14 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
 			}
 		}
 	} else if (strcmp(update, "linear-grow-update") == 0) {
+		unsigned int max = __le32_to_cpu(sb->max_dev);
 		sb->raid_disks = __cpu_to_le32(info->array.raid_disks);
 		sb->dev_roles[info->disk.number] =
 			__cpu_to_le16(info->disk.raid_disk);
+		if (info->array.raid_disks >= max) {
+			sb->dev_roles[max] = __cpu_to_le16(MD_DISK_ROLE_SPARE);
+			sb->max_dev = __cpu_to_le32(max+1);
+		}
 	} else if (strcmp(update, "resync") == 0) {
 		/* make sure resync happens */
 		sb->resync_offset = 0ULL;
-- 
2.12.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-05-25  0:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-22  6:16 [PATCH v4] super1: fix sb->max_dev when adding a new disk in linear array Lidong Zhong
2017-05-22 11:07 ` NeilBrown
2017-05-23  3:55   ` Lidong Zhong
2017-05-24  1:57     ` NeilBrown
2017-05-24  9:24       ` Lidong Zhong
2017-05-25  0:32         ` NeilBrown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).