From c03ef02d92e4b2a7397f7247ea5a25d932a1a889 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 18 May 2010 12:29:28 +1000 Subject: 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 --- Grow.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Grow.c b/Grow.c index 0916c5d..28ed8d7 100644 --- a/Grow.c +++ b/Grow.c @@ -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); -- cgit