From: Neil Brown <neilb@suse.de>
Date: Sat, 11 Aug 2007 22:18:08 +0000 (+0200)
Subject: md/bitmap: fix online removal of file-backed bitmaps
X-Git-Tag: v2.6.16.54-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd0593c7408afa9dcc29db6a80669761107ee3c;p=thirdparty%2Fkernel%2Fstable.git

md/bitmap: fix online removal of file-backed bitmaps

When "mdadm --grow /dev/mdX --bitmap=none" is used to remove a filebacked
bitmap, the bitmap was disconnected from the array, but the file wasn't closed
(until the array was stopped).

The file also wasn't closed if adding the bitmap file failed.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 489eaf31a96c7..0d26b39e8a13f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3356,10 +3356,13 @@ static int set_bitmap_file(mddev_t *mddev, int fd)
 		mddev->pers->quiesce(mddev, 1);
 		if (fd >= 0)
 			err = bitmap_create(mddev);
-		if (fd < 0 || err)
+		if (fd < 0 || err) {
 			bitmap_destroy(mddev);
+			fd = -1; /* make sure to put the file */
+		}
 		mddev->pers->quiesce(mddev, 0);
-	} else if (fd < 0) {
+	}
+	if (fd < 0) {
 		if (mddev->bitmap_file)
 			fput(mddev->bitmap_file);
 		mddev->bitmap_file = NULL;