[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-1.exp5-2-g8165a84

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 8165a84ec20e33e1ead472408f289787d332611b
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Mon Jan 26 23:07:38 2009 +0100

    debian/patches/08_isw_rebuild.patch: Fix ISW Metadata is corrupted after rebuilding is started

diff --git a/debian/patches/08_isw_rebuild.patch b/debian/patches/08_isw_rebuild.patch
new file mode 100644
index 0000000..7c998d6
--- /dev/null
+++ b/debian/patches/08_isw_rebuild.patch
@@ -0,0 +1,20 @@
+--- a/1.0.0.rc15/lib/format/ataraid/isw.c
++++ b/1.0.0.rc15/lib/format/ataraid/isw.c
+@@ -2387,14 +2387,13 @@ update_metadata_isw_dev(struct isw *new_
+ 	 * a new function 'raid_is_rebuildable()'.
+ 	 */
+ 	((struct isw_map *)
+-	 ((void *) &new_dev->vol.map + map_size))->map_state =
++	 ((void *) &new_dev->vol.map) + map_size)->map_state =
+ 		new_dev->vol.map.raid_level == ISW_T_RAID0 ?
+ 		ISW_T_STATE_FAILED : ISW_T_STATE_DEGRADED;
+ 
+ 	return (unsigned)
+-		((unsigned long) &new_dev->vol.map + 2 * map_size) -
+-		((unsigned long) new_isw->disk + new_isw->num_disks) -
+-		isw_dev_offs;
++		((unsigned long) (((void*) &new_dev->vol.map) + 2 * map_size)) -
++		((unsigned long) new_dev);
+ }
+ 
+ /* Update metadata wit hdrive to rebuild. */
diff --git a/debian/patches/series b/debian/patches/series
index 11fb8f9..58d3fb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
 05_kernel-event-handling.patch
 06_fix_led_support_compilation.patch
 07_isw_metadata_normal_state.patch
+08_isw_rebuild.patch
 09_promise-add-offsets.patch
 10_exit_code.patch
 12_support_virtio_devices.patch

-- 
Maintenance of the dmraid package