From 50f5025494542167473b9aa773afa7d44806c104 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 8 May 2009 10:58:13 +0200 Subject: temporary patch to fix incremental.c compiling Signed-off-by: martin f. krafft --- ...lised-superblock-pointer-fixes-compiler-w.patch | 37 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 debian/patches/Use-initialised-superblock-pointer-fixes-compiler-w.patch (limited to 'debian') diff --git a/debian/patches/Use-initialised-superblock-pointer-fixes-compiler-w.patch b/debian/patches/Use-initialised-superblock-pointer-fixes-compiler-w.patch new file mode 100644 index 00000000..977ac387 --- /dev/null +++ b/debian/patches/Use-initialised-superblock-pointer-fixes-compiler-w.patch @@ -0,0 +1,37 @@ +From 95935f9892c39377375496d1ca2ba7547b07759f Mon Sep 17 00:00:00 2001 +From: martin f. krafft +Date: Fri, 8 May 2009 10:56:17 +0200 +Subject: [PATCH] Use initialised superblock pointer, fixes compiler warning + +This is from Neil and will be included in the next push; for now, it +enables the compile. + +Signed-off-by: martin f. krafft +--- + Incremental.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Incremental.c b/Incremental.c +index f7e602e..f8fc359 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -369,14 +369,14 @@ int Incremental(char *devname, int verbose, int runstop, + /* add disk needs to know about containers */ + if (st->ss->external) + sra->array.level = LEVEL_CONTAINER; +- err = add_disk(mdfd, st2, sra, &info2); ++ err = add_disk(mdfd, st, sra, &info2); + if (err < 0 && errno == EBUSY) { + /* could be another device present with the same + * disk.number. Find and reject any such + */ + find_reject(mdfd, st, sra, info.disk.number, + info.events, verbose, chosen_name); +- err = add_disk(mdfd, st2, sra, &info2); ++ err = add_disk(mdfd, st, sra, &info2); + } + if (err < 0) { + fprintf(stderr, Name ": failed to add %s to %s: %s.\n", +-- +1.6.2.4 + diff --git a/debian/patches/series b/debian/patches/series index e69de29b..baf2155c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +Use-initialised-superblock-pointer-fixes-compiler-w.patch -p1 -- cgit v1.2.3