Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b8b3e8a authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: make sure md bitmap updates are flushed when array is stopped. 



The recent change to never ignore the bitmap, revealed that the bitmap isn't
begin flushed properly when an array is stopped.

We call bitmap_daemon_work three times as there is a three-stage pipeline for
flushing updates to the bitmap file.

Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e3b9703e

drivers/md/bitmap.c

+23 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,29 @@ static void bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset) 


}



/*

 * flush out any pending updates

 */

void bitmap_flush(mddev_t *mddev)

{

	struct bitmap *bitmap = mddev->bitmap;

	int sleep;



	if (!bitmap) /* there was no bitmap */

		return;



	/* run the daemon_work three time to ensure everything is flushed

	 * that can be

	 */

	sleep = bitmap->daemon_sleep;

	bitmap->daemon_sleep = 0;

	bitmap_daemon_work(bitmap);

	bitmap_daemon_work(bitmap);

	bitmap_daemon_work(bitmap);

	bitmap->daemon_sleep = sleep;

	bitmap_update_sb(bitmap);

}



/*

 * free memory that was allocated

 */

drivers/md/md.c

+2 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,8 @@ static int do_md_stop(mddev_t * mddev, int ro) 
				goto out;

			mddev->ro = 1;

		} else {

			bitmap_flush(mddev);

			wait_event(mddev->sb_wait, atomic_read(&mddev->pending_writes)==0);

			if (mddev->ro)

				set_disk_ro(disk, 0);

			blk_queue_make_request(mddev->queue, md_fail_request);

include/linux/raid/bitmap.h

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ struct bitmap { 


/* these are used only by md/bitmap */

int  bitmap_create(mddev_t *mddev);

void bitmap_flush(mddev_t *mddev);

void bitmap_destroy(mddev_t *mddev);

int  bitmap_active(struct bitmap *bitmap);