diff options
author | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2008-08-07 14:12:25 +1000 |
commit | 37ea3936a696c2b102963ba5117165ef6be8d4b4 (patch) | |
tree | 75fe06d0b49ef74f834a25920f003c693023857e /Grow.c | |
parent | 9ca2c81c0f8bd37ef24e5e3ac898ffb6cfd00117 (diff) | |
parent | e5669f40047ba0a8354418d0af5f7e7d862aaea4 (diff) | |
download | mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.gz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.tar.xz mdadm-37ea3936a696c2b102963ba5117165ef6be8d4b4.zip |
Merge branch 'master' into from-stable
Conflicts:
Create.c
Manage.c
Diffstat (limited to 'Grow.c')
-rw-r--r-- | Grow.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -615,7 +615,8 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file, last_block = nstripe * ndata; ostripe = last_block / odata / (ochunk/512) * (ochunk/512); } - printf("mdadm: Need to backup %lluK of critical section..\n", last_block/2); + fprintf(stderr, Name ": Need to backup %lluK of critical " + "section..\n", last_block/2); sra = sysfs_read(fd, 0, GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE| @@ -685,7 +686,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file, } spares = sra->array.spare_disks; if (backup_file) { - fdlist[d] = open(backup_file, O_RDWR|O_CREAT|O_EXCL, 0600); + fdlist[d] = open(backup_file, O_RDWR|O_CREAT|O_EXCL, S_IRUSR | S_IWUSR); if (fdlist[d] < 0) { fprintf(stderr, Name ": %s: cannot create backup file %s: %s\n", devname, backup_file, strerror(errno)); @@ -837,7 +838,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file, if (backup_file) unlink(backup_file); - printf(Name ": ... critical section passed.\n"); + fprintf(stderr, Name ": ... critical section passed.\n"); break; } return 0; |