提交 3178b0db 编写于 作者: N NeilBrown 提交者: Linus Torvalds

[PATCH] md: do not set mddev->bitmap until bitmap is fully initialised

When hot-adding a bitmap, bitmap_daemon_work could get called while the bitmap
is being created, so don't set mddev->bitmap until the bitmap is ready.

This requires freeing the bitmap inside bitmap_create if creation failed
part-way through.
Signed-off-by: NNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 585f0dd5
...@@ -1503,17 +1503,14 @@ void bitmap_flush(mddev_t *mddev) ...@@ -1503,17 +1503,14 @@ void bitmap_flush(mddev_t *mddev)
/* /*
* free memory that was allocated * free memory that was allocated
*/ */
void bitmap_destroy(mddev_t *mddev) static void bitmap_free(struct bitmap *bitmap)
{ {
unsigned long k, pages; unsigned long k, pages;
struct bitmap_page *bp; struct bitmap_page *bp;
struct bitmap *bitmap = mddev->bitmap;
if (!bitmap) /* there was no bitmap */ if (!bitmap) /* there was no bitmap */
return; return;
mddev->bitmap = NULL; /* disconnect from the md device */
/* release the bitmap file and kill the daemon */ /* release the bitmap file and kill the daemon */
bitmap_file_put(bitmap); bitmap_file_put(bitmap);
...@@ -1531,6 +1528,17 @@ void bitmap_destroy(mddev_t *mddev) ...@@ -1531,6 +1528,17 @@ void bitmap_destroy(mddev_t *mddev)
kfree(bp); kfree(bp);
kfree(bitmap); kfree(bitmap);
} }
void bitmap_destroy(mddev_t *mddev)
{
struct bitmap *bitmap = mddev->bitmap;
if (!bitmap) /* there was no bitmap */
return;
mddev->bitmap = NULL; /* disconnect from the md device */
bitmap_free(bitmap);
}
/* /*
* initialize the bitmap structure * initialize the bitmap structure
...@@ -1561,15 +1569,15 @@ int bitmap_create(mddev_t *mddev) ...@@ -1561,15 +1569,15 @@ int bitmap_create(mddev_t *mddev)
spin_lock_init(&bitmap->lock); spin_lock_init(&bitmap->lock);
bitmap->mddev = mddev; bitmap->mddev = mddev;
mddev->bitmap = bitmap;
spin_lock_init(&bitmap->write_lock); spin_lock_init(&bitmap->write_lock);
INIT_LIST_HEAD(&bitmap->complete_pages); INIT_LIST_HEAD(&bitmap->complete_pages);
init_waitqueue_head(&bitmap->write_wait); init_waitqueue_head(&bitmap->write_wait);
bitmap->write_pool = mempool_create(WRITE_POOL_SIZE, write_pool_alloc, bitmap->write_pool = mempool_create(WRITE_POOL_SIZE, write_pool_alloc,
write_pool_free, NULL); write_pool_free, NULL);
err = -ENOMEM;
if (!bitmap->write_pool) if (!bitmap->write_pool)
return -ENOMEM; goto error;
bitmap->file = file; bitmap->file = file;
bitmap->offset = mddev->bitmap_offset; bitmap->offset = mddev->bitmap_offset;
...@@ -1577,7 +1585,7 @@ int bitmap_create(mddev_t *mddev) ...@@ -1577,7 +1585,7 @@ int bitmap_create(mddev_t *mddev)
/* read superblock from bitmap file (this sets bitmap->chunksize) */ /* read superblock from bitmap file (this sets bitmap->chunksize) */
err = bitmap_read_sb(bitmap); err = bitmap_read_sb(bitmap);
if (err) if (err)
return err; goto error;
bitmap->chunkshift = find_first_bit(&bitmap->chunksize, bitmap->chunkshift = find_first_bit(&bitmap->chunksize,
sizeof(bitmap->chunksize)); sizeof(bitmap->chunksize));
...@@ -1601,8 +1609,9 @@ int bitmap_create(mddev_t *mddev) ...@@ -1601,8 +1609,9 @@ int bitmap_create(mddev_t *mddev)
#else #else
bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL); bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL);
#endif #endif
err = -ENOMEM;
if (!bitmap->bp) if (!bitmap->bp)
return -ENOMEM; goto error;
memset(bitmap->bp, 0, pages * sizeof(*bitmap->bp)); memset(bitmap->bp, 0, pages * sizeof(*bitmap->bp));
bitmap->flags |= BITMAP_ACTIVE; bitmap->flags |= BITMAP_ACTIVE;
...@@ -1617,16 +1626,22 @@ int bitmap_create(mddev_t *mddev) ...@@ -1617,16 +1626,22 @@ int bitmap_create(mddev_t *mddev)
err = bitmap_init_from_disk(bitmap, start); err = bitmap_init_from_disk(bitmap, start);
if (err) if (err)
return err; goto error;
printk(KERN_INFO "created bitmap (%lu pages) for device %s\n", printk(KERN_INFO "created bitmap (%lu pages) for device %s\n",
pages, bmname(bitmap)); pages, bmname(bitmap));
mddev->bitmap = bitmap;
/* kick off the bitmap daemons */ /* kick off the bitmap daemons */
err = bitmap_start_daemons(bitmap); err = bitmap_start_daemons(bitmap);
if (err) if (err)
return err; return err;
return bitmap_update_sb(bitmap); return bitmap_update_sb(bitmap);
error:
bitmap_free(bitmap);
return err;
} }
/* the bitmap API -- for raid personalities */ /* the bitmap API -- for raid personalities */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册