From 53ed6ac36ef96e2327564b29ae06e3cc2820ba8f Mon Sep 17 00:00:00 2001 From: Krzysztof Wojcik Date: Mon, 14 Mar 2011 18:21:21 +1100 Subject: [PATCH] Warn the user about too small array size If single-disk RAID0 or RAID1 array is created, user may preserve data on disk. If array given size covers all partitions on disk, all data will be available on created array. If array size is too small (not covers all partitions), data will be not accessible. This patch introduces warning message during array creation if given size is too small. User may interrupt creation process to avoid data loss. Signed-off-by: Krzysztof Wojcik Signed-off-by: NeilBrown --- Create.c | 6 +++--- mdadm.h | 4 +++- util.c | 9 ++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Create.c b/Create.c index 2e3d723..6349f86 100644 --- a/Create.c +++ b/Create.c @@ -387,14 +387,14 @@ int Create(struct supertype *st, char *mddev, if (strcmp(st->ss->name, "1.x") == 0 && st->minor_version >= 1) /* metadata at front */ - warn |= check_partitions(fd, dname, 0); + warn |= check_partitions(fd, dname, 0, 0); else if (level == 1 || level == LEVEL_CONTAINER || (level == 0 && raiddisks == 1)) /* partitions could be meaningful */ - warn |= check_partitions(fd, dname, freesize*2); + warn |= check_partitions(fd, dname, freesize*2, size*2); else /* partitions cannot be meaningful */ - warn |= check_partitions(fd, dname, 0); + warn |= check_partitions(fd, dname, 0, 0); if (strcmp(st->ss->name, "1.x") == 0 && st->minor_version >= 1 && did_default && diff --git a/mdadm.h b/mdadm.h index fa84ad2..d3ed50a 100644 --- a/mdadm.h +++ b/mdadm.h @@ -1079,7 +1079,9 @@ extern int parse_layout_faulty(char *layout); extern int check_ext2(int fd, char *name); extern int check_reiser(int fd, char *name); extern int check_raid(int fd, char *name); -extern int check_partitions(int fd, char *dname, unsigned long long freesize); +extern int check_partitions(int fd, char *dname, + unsigned long long freesize, + unsigned long long size); extern int get_mdp_major(void); extern int dev_open(char *dev, int flags); diff --git a/util.c b/util.c index c22bb3b..cc6ccb4 100644 --- a/util.c +++ b/util.c @@ -1370,7 +1370,8 @@ static int get_last_partition_end(int fd, unsigned long long *endofpart) return retval; } -int check_partitions(int fd, char *dname, unsigned long long freesize) +int check_partitions(int fd, char *dname, unsigned long long freesize, + unsigned long long size) { /* * Check where the last partition ends @@ -1393,6 +1394,12 @@ int check_partitions(int fd, char *dname, unsigned long long freesize) Name ": metadata will over-write last partition on %s.\n", dname); return 1; + } else if (size && endofpart > size) { + /* partitions will be truncated in new device */ + fprintf(stderr, + Name ": array size is too small to cover all partitions on %s.\n", + dname); + return 1; } } return 0;