From 901c91d2fbc2b9787cb65b544441c2abb1b4917f Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Mon, 9 Jul 2007 18:49:04 +0000 Subject: [PATCH] - Oops, if we call -C -e1, minor_version is no longer properly set, fix that up - Related: bz230207 --- mdadm-2.6.2-assemble-ver1-superblock.patch | 10 +++++++++- mdadm.spec | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mdadm-2.6.2-assemble-ver1-superblock.patch b/mdadm-2.6.2-assemble-ver1-superblock.patch index f8aa151..e1b5135 100644 --- a/mdadm-2.6.2-assemble-ver1-superblock.patch +++ b/mdadm-2.6.2-assemble-ver1-superblock.patch @@ -1,5 +1,5 @@ --- mdadm-2.6.2/super1.c.ver1 2007-05-21 00:25:40.000000000 -0400 -+++ mdadm-2.6.2/super1.c 2007-07-02 16:53:04.000000000 -0400 ++++ mdadm-2.6.2/super1.c 2007-07-09 14:19:50.000000000 -0400 @@ -152,9 +152,17 @@ static void examine_super1(void *sbv, ch char *c; int l = homehost ? strlen(homehost) : 0; @@ -78,3 +78,11 @@ free(st); return NULL; +@@ -1154,6 +1172,7 @@ static __u64 avail_size1(struct supertyp + devsize -= choose_bm_space(devsize); + + switch(st->minor_version) { ++ case -1: + case 0: + /* at end */ + return ((devsize - 8*2 ) & ~(4*2-1)); diff --git a/mdadm.spec b/mdadm.spec index 41d747a..5ef5c5e 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 2.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Patch1: mdadm-2.5.2-s390-build.patch @@ -89,6 +89,11 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Mon Jul 09 2007 Doug Ledford - 2.6.2-4 +- Oops, if we call -C -e1, minor_version is no longer properly set, fix that + up +- Related: bz230207 + * Fri Jul 06 2007 Doug Ledford - 2.6.2-3 - Oops, had to update the file leak patch, missed one thing - Minor tweak to return codes in init script and add LSB header @@ -106,7 +111,7 @@ fi - Make the mdmonitor script use daemon() correctly - Fix a bug where manage mode would not add disks correctly under certain conditions -- Resolves: bz244582, bz242688, bz230207, bz169596, bz171862, bz171938 +- Resolves: bz244582, bz242688, bz230207, bz169516, bz171862, bz171938 - Resolves: bz174642, bz224272, bz186524 * Mon Jul 02 2007 Doug Ledford - 2.6.2-1