From fed6ce1623036485b6050cefd422b6cb22f73236 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 18 Apr 2012 11:57:51 +1000 Subject: [PATCH] super1: reserve at least 2 chunks for reshape headroom. sometimes 0.1% isn't enough, though mostly only in testing. We need one chunk for a successful reshape, so reserve 2. Signed-off-by: NeilBrown --- super1.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) --- mdadm-3.2.6.orig/super1.c +++ mdadm-3.2.6/super1.c @@ -1256,11 +1256,15 @@ static int write_init_super1(struct supe /* We try to leave 0.1% at the start for reshape * operations, but limit this to 128Meg (0.1% of 10Gig) * which is plenty for efficient reshapes + * However we make it at least 2 chunks as one chunk + * is minimum needed for reshape. */ headroom = 128 * 1024 * 2; - while (headroom << 10 > array_size) + while (headroom << 10 > array_size && + headroom/2 >= __le32_to_cpu(sb->chunksize) * 2) headroom >>= 1; + switch(st->minor_version) { case 0: sb_offset = dsize; @@ -1596,8 +1600,8 @@ static struct supertype *match_metadata_ * superblock type st, and reserving 'reserve' sectors for * a possible bitmap */ -static __u64 avail_size1(struct supertype *st, __u64 devsize, - long long data_offset) +static __u64 _avail_size1(struct supertype *st, __u64 devsize, + long long data_offset, int chunksize) { struct mdp_superblock_1 *super = st->sb; int bmspace = 0; @@ -1640,7 +1644,9 @@ static __u64 avail_size1(struct supertyp * Limit slack to 128M, but aim for about 0.1% */ unsigned long long headroom = 128*1024*2; - while ((headroom << 10) > devsize) + while ((headroom << 10) > devsize && + (chunksize == 0 || + headroom / 2 >= ((unsigned)chunksize*2)*2)) headroom >>= 1; devsize -= headroom; } @@ -1657,6 +1663,11 @@ static __u64 avail_size1(struct supertyp } return 0; } +static __u64 avail_size1(struct supertype *st, __u64 devsize, + long long data_offset) +{ + return _avail_size1(st, devsize, data_offset, 0); +} static int add_internal_bitmap1(struct supertype *st, @@ -1897,7 +1908,7 @@ static int validate_geometry1(struct sup } close(fd); - *freesize = avail_size1(st, ldsize >> 9, data_offset); + *freesize = _avail_size1(st, ldsize >> 9, data_offset, *chunk); return 1; } #endif /* MDASSEMBLE */