Hello community, here is the log from the commit of package evms checked in at Fri Apr 28 21:10:14 CEST 2006. -------- --- evms/evms.changes 2006-04-20 16:37:00.000000000 +0200 +++ STABLE/evms/evms.changes 2006-04-26 17:14:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 26 17:12:32 CEST 2006 - ghorlacher@suse.de + +- add md_super_fix.patch for bug #169283 + +------------------------------------------------------------------- New: ---- md_super_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evms.spec ++++++ --- /var/tmp/diff_new_pack.bQcOgZ/_old 2006-04-28 21:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.bQcOgZ/_new 2006-04-28 21:10:03.000000000 +0200 @@ -20,7 +20,7 @@ %endif Autoreqprov: on Version: 2.5.5 -Release: 15 +Release: 19 Summary: EVMS--Enterprise Volume Management System BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Patch10: evms_raid5.patch Patch11: compaq_naming_gpt.patch Patch12: prevent_unaligned_warning.patch +Patch13: md_super_fix.patch %description This package contains the userspace tools needed to manage EVMS @@ -106,6 +107,7 @@ %patch10 -p1 %patch11 %patch12 +%patch13 -p1 %build autoconf @@ -181,6 +183,8 @@ /etc/ha.d/resource.d/evms_failover %changelog -n evms +* Wed Apr 26 2006 - ghorlacher@suse.de +- add md_super_fix.patch for bug #169283 * Thu Apr 20 2006 - fehr@suse.de - prevent warning about misalignment on ia64 * Wed Apr 19 2006 - fehr@suse.de ++++++ md_super_fix.patch ++++++ --- evms-2.5.5/plugins/md/md_super.c 2006-02-22 14:34:53.000000000 -0600 +++ evms-2.5.5.fix/plugins/md/md_super.c 2006-04-20 11:00:40.733364216 -0500 @@ -1312,13 +1312,13 @@ static int sb0_zero_superblock(md_member_t *member, boolean now) { - mdp_super_t sb; + char buf[MD_SB_BYTES]; LOG_ENTRY(); if (now == TRUE) { - memset(&sb, 0, MD_SB_BYTES); - if ( WRITE(member->obj, member->super_offset, MD_SB_SECTORS, (char*)&sb)) { + memset(buf, 0, MD_SB_BYTES); + if ( WRITE(member->obj, member->super_offset, MD_SB_SECTORS, buf)) { LOG_EXIT_INT(EIO); return EIO; } @@ -1332,7 +1332,7 @@ static int sb0_zero_saved_info(md_member_t *member, boolean now) { - md_saved_info_t info; + char buf[MD_SAVED_INFO_BYTES]; u_int64_t location; LOG_ENTRY(); @@ -1341,8 +1341,8 @@ location += MD_SB0_SAVED_INFO_SECTOR_OFFSET; if (now == TRUE) { - memset(&info, 0, sizeof(md_saved_info_t)); - if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, (char*)&info)) { + memset(buf, 0, MD_SAVED_INFO_BYTES); + if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, buf)) { LOG_EXIT_INT(EIO); return EIO; } @@ -2451,6 +2451,7 @@ { int rc = 0; mdp_sb_1_t *duplicate = NULL; + mdp_sb_1_t *master; md_volume_t *vol; LOG_ENTRY(); @@ -2462,9 +2463,16 @@ } vol = member->vol; + master = (mdp_sb_1_t *)vol->sb; + + if (vol->flags & (MD_NEW_REGION | MD_DEGRADED)) { + LOG_WARNING("%s: Creating new array with missing disk," + " set resync_offset to -1.\n", vol->name); + master->resync_offset = -1; + } /* Copy from master superblock */ - rc = sb1_duplicate_sb(&member->sb, vol->sb); + rc = sb1_duplicate_sb(&member->sb, master); if (rc) { goto out; } @@ -2602,8 +2610,8 @@ member->obj->name, member->super_offset); if (now == TRUE) { - memset(&sb, 0, MD_SB_1_BYTES); - if ( WRITE(member->obj, member->super_offset, MD_SB_1_SECTORS, (char*)&sb)) { + memset(sb, 0, MD_SB_1_BYTES); + if ( WRITE(member->obj, member->super_offset, MD_SB_1_SECTORS, sb)) { LOG_EXIT_INT(EIO); return EIO; } @@ -2616,7 +2624,7 @@ static int sb1_zero_saved_info(md_member_t *member, boolean now) { - md_saved_info_t info; + char buf[MD_SAVED_INFO_BYTES]; u_int64_t location; LOG_ENTRY(); @@ -2627,8 +2635,8 @@ member->obj->name, location); if (now == TRUE) { - memset(&info, 0, sizeof(md_saved_info_t)); - if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, (char*)&info)) { + memset(buf, 0, MD_SAVED_INFO_BYTES); + if ( WRITE(member->obj, location, MD_SAVED_INFO_SECTS, buf) ) { LOG_EXIT_INT(EIO); return EIO; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de