Merge branch 'master' in devel-3.0
authorNeilBrown <neilb@suse.de>
Tue, 10 Mar 2009 05:47:02 +0000 (16:47 +1100)
committerNeilBrown <neilb@suse.de>
Tue, 10 Mar 2009 05:47:02 +0000 (16:47 +1100)
1  2 
Makefile
Monitor.c
inventory
mdassemble.c
super1.c

diff --cc Makefile
+++ b/Makefile
@@@ -96,9 -81,8 +96,9 @@@ STATICSRC = pwgr.
  STATICOBJS = pwgr.o
  
  ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
 -      super0.c super1.c sha1.c sysfs.c
 -ASSEMBLE_AUTO_SRCS := mdopen.c mdstat.c
 +      super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c mdstat.c \
-       platform-intel.c probe_roms.c
- ASSEMBLE_AUTO_SRCS := mdopen.c sysfs.c
++      platform-intel.c probe_roms.c sysfs.c
++ASSEMBLE_AUTO_SRCS := mdopen.c
  ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
  ifdef MDASSEMBLE_AUTO
  ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
diff --cc Monitor.c
Simple merge
diff --cc inventory
+++ b/inventory
@@@ -23,8 -23,7 +23,9 @@@ ANNOUNCE-2.6.
  ANNOUNCE-2.6.6
  ANNOUNCE-2.6.7
  ANNOUNCE-2.6.8
+ ANNOUNCE-2.6.9
 +ANNOUNCE-3.0-devel1
 +ANNOUNCE-3.0-devel2
  Assemble.c
  bitmap.c
  bitmap.h
diff --cc mdassemble.c
@@@ -69,25 -69,7 +69,21 @@@ int open_mddev(char *dev, int report_er
        }
        return mdfd;
  }
- int sysfs_uevent(struct mdinfo *info, char *event)
- {
-       return 0;
- }
 +int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,
 +               char *chosen)
 +{
 +      return open_mddev(dev, 0);
 +}
  #endif
 +int map_update(struct map_ent **mpp, int devnum, char *metadata,
 +             int *uuid, char *path)
 +{
 +      return 0;
 +}
 +struct map_ent *map_by_name(struct map_ent **mpp, char *name)
 +{
 +      return NULL;
 +}
  
  int rv;
  int mdfd = -1;
diff --cc super1.c
+++ b/super1.c
@@@ -884,23 -795,10 +884,27 @@@ static int add_to_super1(struct superty
                *rp = 0xffff;
        else
                *rp = 0xfffe;
 +
+       if (dk->number >= __le32_to_cpu(sb->max_dev) &&
+           __le32_to_cpu(sb->max_dev) < 384)
+               sb->max_dev = __cpu_to_le32(dk->number+1);
++
 +      sb->dev_number = __cpu_to_le32(dk->number);
 +      sb->sb_csum = calc_sb_1_csum(sb);
 +
 +      dip = (struct devinfo **)&st->info;
 +      while (*dip)
 +              dip = &(*dip)->next;
 +      di = malloc(sizeof(struct devinfo));
 +      di->fd = fd;
 +      di->devname = devname;
 +      di->disk = *dk;
 +      di->next = NULL;
 +      *dip = di;
 +
 +      return 0;
  }
 +#endif
  
  static void locate_bitmap1(struct supertype *st, int fd);