浏览代码

md/bitmap: prevent bitmap_daemon_work running while initialising bitmap

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: stable@vger.kernel.org
Signed-off-by: NeilBrown <neilb@suse.de>
NeilBrown 13 年之前
父节点
当前提交
afbaa90b80
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      drivers/md/bitmap.c

+ 2 - 0
drivers/md/bitmap.c

@@ -1785,7 +1785,9 @@ int bitmap_load(struct mddev *mddev)
 		 * re-add of a missing device */
 		 * re-add of a missing device */
 		start = mddev->recovery_cp;
 		start = mddev->recovery_cp;
 
 
+	mutex_lock(&mddev->bitmap_info.mutex);
 	err = bitmap_init_from_disk(bitmap, start);
 	err = bitmap_init_from_disk(bitmap, start);
+	mutex_unlock(&mddev->bitmap_info.mutex);
 
 
 	if (err)
 	if (err)
 		goto out;
 		goto out;