summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-05-22 13:55:21 +1000
committerNeilBrown <neilb@suse.de>2012-05-22 13:55:21 +1000
commitfae7d326cd0905624c173337fdfcfe9b86b9e6e2 (patch)
tree2f98bd9e055dce2250c0ba813aeaa95873665018 /drivers/md
parent62f82faaceb483284ea938b3a092b9f0a4d2d029 (diff)
downloadlinux-fae7d326cd0905624c173337fdfcfe9b86b9e6e2.tar.bz2
md/bitmap: merge bitmap_file_unmap and bitmap_file_put.
There functions really do one thing together: release the 'bitmap_storage'. So make them just one function. Since we removed the locking (previous patch), we don't need to zero any fields before freeing them, so it all becomes a bit simpler. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/bitmap.c34
1 files changed, 10 insertions, 24 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 7e015c9ea73e..d2ab7d3df3ea 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -732,43 +732,25 @@ static int bitmap_storage_alloc(struct bitmap_storage *store,
return 0;
}
-static void bitmap_file_unmap(struct bitmap *bitmap)
+static void bitmap_file_unmap(struct bitmap_storage *store)
{
struct page **map, *sb_page;
- unsigned long *attr;
int pages;
- struct bitmap_storage *store = &bitmap->storage;
+ struct file *file;
+ file = store->file;
map = store->filemap;
- store->filemap = NULL;
- attr = store->filemap_attr;
- store->filemap_attr = NULL;
pages = store->file_pages;
- store->file_pages = 0;
sb_page = store->sb_page;
- store->sb_page = NULL;
while (pages--)
if (map[pages] != sb_page) /* 0 is sb_page, release it below */
free_buffers(map[pages]);
kfree(map);
- kfree(attr);
+ kfree(store->filemap_attr);
if (sb_page)
free_buffers(sb_page);
-}
-
-static void bitmap_file_put(struct bitmap *bitmap)
-{
- struct file *file;
-
- file = bitmap->storage.file;
- bitmap->storage.file = NULL;
-
- if (file)
- wait_event(bitmap->write_wait,
- atomic_read(&bitmap->pending_writes)==0);
- bitmap_file_unmap(bitmap);
if (file) {
struct inode *inode = file->f_path.dentry->d_inode;
@@ -1610,8 +1592,12 @@ static void bitmap_free(struct bitmap *bitmap)
if (!bitmap) /* there was no bitmap */
return;
- /* release the bitmap file and kill the daemon */
- bitmap_file_put(bitmap);
+ /* Shouldn't be needed - but just in case.... */
+ wait_event(bitmap->write_wait,
+ atomic_read(&bitmap->pending_writes) == 0);
+
+ /* release the bitmap file */
+ bitmap_file_unmap(&bitmap->storage);
bp = bitmap->bp;
pages = bitmap->pages;