From: NeilBrown <neilb@suse.de>
Date: Tue, 30 Nov 2010 05:34:25 +0000 (+1100)
Subject: Grow: give useful message when adding bitmap gives EBUSY.
X-Git-Tag: mdadm-3.1.5~26
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=0d924c9a93ff23010d0d259834ba5d7c87160523

Grow: give useful message when adding bitmap gives EBUSY.

If adding a bitmap fails with EBUSY, then it is because the array is
currently resyncing/recovering/reshaping.
As this is non-obvious, give a message explaining the fact.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index 61e7ab89..8294f40d 100644
--- a/Grow.c
+++ b/Grow.c
@@ -327,6 +327,10 @@ int Grow_addbitmap(char *devname, int fd, char *file, int chunk, int delay, int
 		}
 		array.state |= (1<<MD_SB_BITMAP_PRESENT);
 		if (ioctl(fd, SET_ARRAY_INFO, &array)!= 0) {
+			if (errno == EBUSY)
+				fprintf(stderr, Name
+					": Cannot add bitmap while array is"
+					" resyncing or reshaping etc.\n");
 			fprintf(stderr, Name ": failed to set internal bitmap.\n");
 			return 1;
 		}
@@ -373,8 +377,13 @@ int Grow_addbitmap(char *devname, int fd, char *file, int chunk, int delay, int
 			return 1;
 		}
 		if (ioctl(fd, SET_BITMAP_FILE, bitmap_fd) < 0) {
+			int err = errno;
+			if (errno == EBUSY)
+				fprintf(stderr, Name
+					": Cannot add bitmap while array is"
+					" resyncing or reshaping etc.\n");
 			fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
-				devname, strerror(errno));
+				devname, strerror(err));
 			return 1;
 		}
 	}