Skip to content

Commit

Permalink
md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
Browse files Browse the repository at this point in the history
If a bitmap is added while the array is active, it is possible
for bitmap_daemon_work to run while the bitmap is being
initialised.
This is particularly a problem if bitmap_daemon_work sees
bitmap->filemap as non-NULL before it has been filled in properly.
So hold bitmap_info.mutex while filling in ->filemap
to prevent problems.

This patch is suitable for any -stable kernel, though it might not
apply cleanly before about 3.1.

Cc: [email protected]
Signed-off-by: NeilBrown <[email protected]>
  • Loading branch information
neilbrown committed Apr 12, 2012
1 parent f4380a9 commit afbaa90
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/md/bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,9 @@ int bitmap_load(struct mddev *mddev)
* re-add of a missing device */
start = mddev->recovery_cp;

mutex_lock(&mddev->bitmap_info.mutex);
err = bitmap_init_from_disk(bitmap, start);
mutex_unlock(&mddev->bitmap_info.mutex);

if (err)
goto out;
Expand Down

0 comments on commit afbaa90

Please sign in to comment.