diff options
author | NeilBrown <neilb@suse.de> | 2009-04-14 11:11:14 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-04-14 11:11:14 +1000 |
commit | c256924e52249b52bad42963176c42601f1a08f4 (patch) | |
tree | 703992c9f376f272232395997a1a74faa58d6f15 /sysfs.c | |
parent | fa5090285af9401f950aa5c1a3a82708c69c4906 (diff) | |
parent | 7e7fffc4022114c491587755998395ef4766fcc2 (diff) | |
download | mdadm-c256924e52249b52bad42963176c42601f1a08f4.tar.gz mdadm-c256924e52249b52bad42963176c42601f1a08f4.tar.xz mdadm-c256924e52249b52bad42963176c42601f1a08f4.zip |
Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
Conflicts:
Grow.c
mdadm.h
sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.
Diffstat (limited to 'sysfs.c')
-rw-r--r-- | sysfs.c | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -525,6 +525,20 @@ int sysfs_set_array(struct mdinfo *info, int vers) rv |= sysfs_set_num(info, NULL, "chunk_size", info->array.chunk_size); rv |= sysfs_set_num(info, NULL, "layout", info->array.layout); rv |= sysfs_set_num(info, NULL, "component_size", info->component_size/2); + if (info->custom_array_size) { + int rc; + + rc = sysfs_set_num(info, NULL, "array_size", + info->custom_array_size/2); + if (rc && errno == ENOENT) { + fprintf(stderr, Name ": This kernel does not " + "have the md/array_size attribute, " + "the array may be larger than expected\n"); + rc = 0; + } + rv |= rc; + } + if (info->array.level > 0) rv |= sysfs_set_num(info, NULL, "resync_start", info->resync_start); return rv; |