From 24af7a8744d947b5c3f062af55312c044ca12a95 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 24 Feb 2010 12:17:17 +1100 Subject: Assemble: clean up properly if we cannot add the bitmap file. If we find we cannot add the requested bitmap file when assembling the array, then make sure to clean up properly and don't leave a half-configured array. Signed-off-by: NeilBrown --- Assemble.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assemble.c b/Assemble.c index 23cc438..1f73a5b 100644 --- a/Assemble.c +++ b/Assemble.c @@ -1057,12 +1057,14 @@ int Assemble(struct supertype *st, char *mddev, if (rv) { fprintf(stderr, Name ": failed to set array info for %s: %s\n", mddev, strerror(errno)); + ioctl(mdfd, STOP_ARRAY, NULL); close(mdfd); return 1; } if (ident->bitmap_fd >= 0) { if (ioctl(mdfd, SET_BITMAP_FILE, ident->bitmap_fd) != 0) { fprintf(stderr, Name ": SET_BITMAP_FILE failed.\n"); + ioctl(mdfd, STOP_ARRAY, NULL); close(mdfd); return 1; } @@ -1072,12 +1074,14 @@ int Assemble(struct supertype *st, char *mddev, if (bmfd < 0) { fprintf(stderr, Name ": Could not open bitmap file %s\n", ident->bitmap_file); + ioctl(mdfd, STOP_ARRAY, NULL); close(mdfd); return 1; } if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) { fprintf(stderr, Name ": Failed to set bitmapfile for %s\n", mddev); close(bmfd); + ioctl(mdfd, STOP_ARRAY, NULL); close(mdfd); return 1; } -- cgit v1.2.1