Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

__write_init_super_ddf(): Use posix_memalign() instead of static aligned buffer 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Jes Sorensen 2012-03-21 08:07:12 +11:00 committed by NeilBrown
parent 654a3817ea
commit 42d5dfd99d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
super-ddf.c
View File

@ -2326,8 +2326,7 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
* called when creating a container or adding another device to a
* container.
*/
static unsigned char null_conf[4096+512];
#define NULL_CONF_SZ 4096
static int __write_init_super_ddf(struct supertype *st)
{
@ -2340,6 +2339,12 @@ static int __write_init_super_ddf(struct supertype *st)
int attempts = 0;
int successes = 0;
unsigned long long size, sector;
char *null_aligned;
if (posix_memalign((void**)&null_aligned, 4096, NULL_CONF_SZ) != 0) {
return -ENOMEM;
}
memset(null_aligned, 0xff, NULL_CONF_SZ);
/* try to write updated metadata,
* if we catch a failure move on to the next disk
@ -2409,14 +2414,11 @@ static int __write_init_super_ddf(struct supertype *st)
if (write(fd, &c->conf, conf_size) < 0)
break;
} else {
char *null_aligned = (char*)((((unsigned long)null_conf)+511)&~511UL);
if (null_conf[0] != 0xff)
memset(null_conf, 0xff, sizeof(null_conf));
unsigned int togo = conf_size;
while (togo > sizeof(null_conf)-512) {
if (write(fd, null_aligned, sizeof(null_conf)-512) < 0)
while (togo > NULL_CONF_SZ) {
if (write(fd, null_aligned, NULL_CONF_SZ) < 0)
break;
togo -= sizeof(null_conf)-512;
togo -= NULL_CONF_SZ;
}
if (write(fd, null_aligned, togo) < 0)
break;
@ -2435,6 +2437,7 @@ static int __write_init_super_ddf(struct supertype *st)
continue;
successes++;
}
free(null_aligned);
return attempts != successes;
}