Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
authorNeilBrown <neilb@suse.de>
Tue, 14 Apr 2009 01:11:14 +0000 (11:11 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 14 Apr 2009 01:11:14 +0000 (11:11 +1000)
Conflicts:
Grow.c
mdadm.h
sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.

1  2 
Grow.c
mapfile.c
mdadm.h
super-ddf.c
sysfs.c

diff --cc Grow.c
--- 1/Grow.c
--- 2/Grow.c
+++ b/Grow.c
@@@ -809,6 -809,8 +809,7 @@@ int Grow_reshape(char *devname, int fd
                /* wait for reshape to pass the critical region */
                while(1) {
                        unsigned long long comp;
 -                      char a[20];
                        if (sysfs_get_ll(sra, NULL, "sync_completed", &comp)<0) {
                                sleep(5);
                                break;
diff --cc mapfile.c
Simple merge
diff --cc mdadm.h
Simple merge
diff --cc super-ddf.c
Simple merge
diff --cc sysfs.c
Simple merge