Merge branch 'master' in devel-3.0
This commit is contained in:
NeilBrown
commit
8844e29149
|
|
@ -0,0 +1,51 @@
|
|||
Subject: ANNOUNCE: mdadm 2.6.9 - A tool for managing Soft RAID under Linux
|
||||
|
||||
I am pleased to announce the availability of
|
||||
mdadm version 2.6.9
|
||||
|
||||
It is available at the usual places:
|
||||
countrycode=xx.
|
||||
http://www.${countrycode}kernel.org/pub/linux/utils/raid/mdadm/
|
||||
and via git at
|
||||
git://neil.brown.name/mdadm
|
||||
http://neil.brown.name/git?p=mdadm
|
||||
|
||||
mdadm is a tool for creating, managing and monitoring
|
||||
device arrays using the "md" driver in Linux, also
|
||||
known as Software RAID arrays.
|
||||
|
||||
Release 2.6.9 contains various bug fixes.
|
||||
Clearly 2.6.8 was not the final 2.x release.
|
||||
Hopefully 2.6.9 will be as I don't want go to 2.7, and
|
||||
2.6.10 might be confusing (though I'll probably go that
|
||||
way if I need to).
|
||||
|
||||
New features will only appear in the 3.x series of which 3.0 will be
|
||||
release within a few months.
|
||||
|
||||
Changelog Entries:
|
||||
Bernhard Reutner-Fischer (1):
|
||||
mdadm fix compilation for uClibc
|
||||
|
||||
Dustin Kirkland (2):
|
||||
Fail overtly when asprintf fails to allocate memory
|
||||
Typo in earlier patch : asprintf -> vasprintf
|
||||
|
||||
NeilBrown (11):
|
||||
Allow --config in --incremental mode.
|
||||
Kill: Don't use O_EXCL when --force is used.
|
||||
Assemble: don't assume array is 'clean' unless all devices think it is.
|
||||
Assemble: set stripe_cache_size properly when restarting a reshape.
|
||||
map: rebuild map if it doesn't exist.
|
||||
Free mdstat data structures properly.
|
||||
Fix the used device size in mdadm -D output.
|
||||
Document 'max' option to --grow --size in --help output.
|
||||
Fix possible crash if bitmap metadata is bad.
|
||||
Monitor: send --test message for arrays in /proc/mdstat that aren't in mdadm.conf
|
||||
super1: make sure max_dev grows enough when adding a device to an array.
|
||||
|
||||
|
||||
Development of mdadm is sponsored by
|
||||
SUSE Labs, Novell Inc.
|
||||
|
||||
NeilBrown 28th November 2008
|
||||
11
Makefile
11
Makefile
|
|
@ -97,8 +97,8 @@ STATICOBJS = pwgr.o
|
|||
|
||||
ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.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)
|
||||
|
|
@ -110,6 +110,9 @@ all : mdadm mdmon mdadm.man md.man mdadm.conf.man
|
|||
everything: all mdadm.static swap_super test_stripe \
|
||||
mdassemble mdassemble.auto mdassemble.static mdassemble.man \
|
||||
mdadm.Os mdadm.O2
|
||||
everything-test: all mdadm.static swap_super test_stripe \
|
||||
mdassemble.auto mdassemble.static mdassemble.man \
|
||||
mdadm.Os mdadm.O2
|
||||
# mdadm.uclibc and mdassemble.uclibc don't work on x86-64
|
||||
# mdadm.tcc doesn't work..
|
||||
|
||||
|
|
@ -215,12 +218,12 @@ clean :
|
|||
mdadm.Os mdadm.O2 \
|
||||
mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
|
||||
mdassemble.klibc swap_super \
|
||||
init.cpio.gz mdadm.uclibc.static test_stripe
|
||||
init.cpio.gz mdadm.uclibc.static test_stripe mdmon
|
||||
|
||||
dist : clean
|
||||
./makedist
|
||||
|
||||
testdist : everything clean
|
||||
testdist : everything-test clean
|
||||
./makedist test
|
||||
|
||||
TAGS :
|
||||
|
|
|
|||
|
|
@ -434,6 +434,8 @@ int Monitor(mddev_dev_t devlist,
|
|||
st->spare_group = NULL;
|
||||
st->expected_spares = -1;
|
||||
statelist = st;
|
||||
if (test)
|
||||
alert("TestMessage", st->devname, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
|
||||
alert("NewArray", st->devname, NULL, mailaddr, mailfrom, alert_cmd, dosyslog);
|
||||
new_found = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ ANNOUNCE-2.6.5
|
|||
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
|
||||
|
|
|
|||
|
|
@ -74,10 +74,6 @@ int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,
|
|||
{
|
||||
return open_mddev(dev, 0);
|
||||
}
|
||||
int sysfs_uevent(struct mdinfo *info, char *event)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
int map_update(struct map_ent **mpp, int devnum, char *metadata,
|
||||
int *uuid, char *path)
|
||||
|
|
|
|||
4
super1.c
4
super1.c
|
|
@ -885,6 +885,10 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
|
|||
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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue