diff options
author | NeilBrown <neilb@suse.de> | 2010-05-18 04:29:28 +0200 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-05-18 04:29:28 +0200 |
commit | c03ef02d92e4b2a7397f7247ea5a25d932a1a889 (patch) | |
tree | da0547f8108ef653b2f9b2a9314795d7ca90e1d0 /Grow.c | |
parent | Grow: avoid overflow of chunk sizes. (diff) | |
download | mdadm-c03ef02d92e4b2a7397f7247ea5a25d932a1a889.tar.xz mdadm-c03ef02d92e4b2a7397f7247ea5a25d932a1a889.zip |
Grow: move error message closer to error cause.
A recent change move the sysfs_read call away from the check that it
succeeded. This patch moves the check back next to the sysfs_read
call.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to '')
-rw-r--r-- | Grow.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -948,6 +948,13 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file, GET_COMPONENT|GET_DEVS|GET_OFFSET|GET_STATE| GET_CACHE); + if (!sra) { + fprintf(stderr, Name ": %s: Cannot get array details from sysfs\n", + devname); + rv = 1; + break; + } + if (ndata == odata) { /* Make 'blocks' bigger for better throughput, but * not so big that we reject it below. @@ -960,13 +967,6 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file, fprintf(stderr, Name ": Need to backup %luK of critical " "section..\n", blocks/2); - if (!sra) { - fprintf(stderr, Name ": %s: Cannot get array details from sysfs\n", - devname); - rv = 1; - break; - } - if (blocks >= sra->component_size/2) { fprintf(stderr, Name ": %s: Something wrong - reshape aborted\n", devname); |