NeilBrown: Fix use of rv in Grow_reshape
Martin F. Krafft
madduck at alioth.debian.org
Sun Aug 29 11:54:42 UTC 2010
Module: mdadm
Branch: debian/conffile-location
Commit: b7e734fc22cb37d42a3c6fec6343490be929f6aa
URL: http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=b7e734fc22cb37d42a3c6fec6343490be929f6aa
Author: NeilBrown <neilb at suse.de>
Date: Thu Jul 29 13:16:01 2010 +1000
Fix use of rv in Grow_reshape
1/ and extra local var was declared, which causes rv setting
to be lost
2/ a -ve rv was left -ve while we should be return 1 on err.
Signed-off-by: NeilBrown <neilb at suse.de>
---
Grow.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Grow.c b/Grow.c
index dd05d4d..e466a08 100644
--- a/Grow.c
+++ b/Grow.c
@@ -759,6 +759,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
if (err == EBUSY &&
(array.state & (1<<MD_SB_BITMAP_PRESENT)))
fprintf(stderr, " Bitmap must be removed before level can be changed\n");
+ rv = 1;
}
}
} else if (!changed && !quiet)
@@ -789,7 +790,6 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
array.layout = parse_layout_faulty(layout_str);
if (array.layout < 0) {
- int rv;
fprintf(stderr, Name ": %s: layout %s not understood for 'faulty' array\n",
devname, layout_str);
rv = 1;
More information about the pkg-mdadm-commits
mailing list