SOURCES: mdadm-fix.patch - official fix

[arekm]

Author: arekm                        Date: Wed May  9 13:28:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- official fix

---- Files affected:
SOURCES:
   mdadm-fix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mdadm-fix.patch
diff -u SOURCES/mdadm-fix.patch:1.1 SOURCES/mdadm-fix.patch:1.2
--- SOURCES/mdadm-fix.patch:1.1	Tue Jul 11 18:55:35 2006
+++ SOURCES/mdadm-fix.patch	Wed May  9 15:28:43 2007
@@ -1,11 +1,26 @@
---- mdadm-2.5.2/util.c.orig	2006-06-26 07:10:45.000000000 +0200
-+++ mdadm-2.5.2/util.c	2006-07-11 18:40:45.760592000 +0200
-@@ -389,7 +389,7 @@
+From: Neil Brown <neilb at suse.de>
+Date: Tue, 8 May 2007 07:12:33 +0000 (+1000)
+Subject: Remove bogus add_dev definition.
+X-Git-Url: http://neil.brown.name/git?p=mdadm;a=commitdiff_plain;h=8e22992203e25ae0b7bdf41cf2c53b11024d64cc
+
+Remove bogus add_dev definition.
+
+If nether ftw nor nftw are available, add_dev gets defined twice.
+Fix that...
+---
+
+diff --git a/util.c b/util.c
+index 58449d5..f57613f 100644
+--- a/util.c
++++ b/util.c
+@@ -468,10 +468,6 @@ int nftw(const char *path, int (*han)(const char *name, const struct stat *stb,
  	return ftw(path, add_dev_1, nopenfd);
  }
  #else
 -int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s)
-+int add_dev_1(const char *name, const struct stat *stb, int flag)
+-{
+-	return 0;
+-}
+ int nftw(const char *path, int (*han)(const char *name, const struct stat *stb, int flag, struct FTW *s), int nopenfd, int flags)
  {
  	return 0;
- }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mdadm-fix.patch?r1=1.1&r2=1.2&f=u