[patch] Patch for systemimager-3.4.1 raidtools (second patch)

systemimager-raidtools2.patch (text/plain), 1.86 KB, created by Mathias Weigt on 2005-06-07 13:13:36 UTC

diff -Naur systemimager-3.4.1.old/patches/raidtools.402.6.Headers.patch systemimager-3.4.1/patches/raidtools.402.6.Headers.patch
--- systemimager-3.4.1.old/patches/raidtools.402.6.Headers.patch	1970-01-01 01:00:00.000000000 +0100
+++ systemimager-3.4.1/patches/raidtools.402.6.Headers.patch	2005-06-06 13:33:26.000000000 +0200
@@ -0,0 +1,50 @@
+diff -ur raidtools-1.00.3/list.h raidtools-1.00.3.plasmaroo/list.h
+--- raidtools-1.00.3/list.h	2003-01-15 08:58:25.000000000 +0000
++++ raidtools-1.00.3.plasmaroo/list.h	2004-07-18 12:25:15.000000000 +0100
+@@ -14,6 +14,11 @@
+  * using the generic single-entry routines.
+  */
+ 
++#define _LINUX_LIST_H
++struct hlist_node {
++        struct hlist_node *next, **pprev;
++};
++
+ struct list_head {
+ 	struct list_head *next, *prev;
+ };
+diff -ur raidtools-1.00.3/lsraid.c raidtools-1.00.3.plasmaroo/lsraid.c
+--- raidtools-1.00.3/lsraid.c	2003-01-15 08:58:25.000000000 +0000
++++ raidtools-1.00.3.plasmaroo/lsraid.c	2004-07-18 12:25:19.000000000 +0100
+@@ -40,16 +40,15 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
++/* Local copies of things I use - Clean up later */
++#include "list.h"
++
+ #include <linux/types.h>
+ #include <linux/major.h>
+ #include <linux/fs.h>
+ #include <linux/raid/md_u.h>
+ #include <linux/raid/md_p.h>
+ 
+-/* Local copies of things I use - Clean up later */
+-#include "list.h"
+-
+-
+ /*
+  * Defines
+  */
+diff -ur raidtools-1.00.3/raid_io.h raidtools-1.00.3.plasmaroo/raid_io.h
+--- raidtools-1.00.3/raid_io.h.old	2005-04-07 15:25:24.937871896 -0600
++++ raidtools-1.00.3/raid_io.h	2005-04-07 15:25:35.315801456 -0600
+@@ -12,7 +12,7 @@
+ #include "common.h"
+ #include "raidlib.h"
+ 
+-void progress (unsigned long blocks, unsigned long current);
++void progress (unsigned long blocks, unsigned long _current_);
+ 
+ long long raidseek (unsigned int fd, unsigned long blk);
+ extern void print_sb (mdp_super_t *sb);