Commit 9ad6b7bc authored by Chris Mason's avatar Chris Mason
Browse files

Force page->private removal in btrfs_invalidatepage 



btrfs_invalidatepage is not allowed to leave pages around on the lru.
Any such pages will trigger an oops later on because the VM will see
page->private and assume it is a buffer head.

This also forces extra flushes of the async work queues before
dropping all the pages on the btree inode during unmount.  Left over
items on the work queues are one possible cause of busy state ranges
during truncate_inode_pages.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 0afbaf8c

fs/btrfs/disk-io.c

+12 −0
Original line number Diff line number Diff line
@@ -533,6 +533,12 @@ static void btree_invalidatepage(struct page *page, unsigned long offset) 
	tree = &BTRFS_I(page->mapping->host)->io_tree;

	extent_invalidatepage(tree, page, offset);

	btree_releasepage(page, GFP_NOFS);

	if (PagePrivate(page)) {

		printk("2invalidate page cleaning up after releasepage\n");

		ClearPagePrivate(page);

		set_page_private(page, 0);

		page_cache_release(page);

	}

}



#if 0
@@ -1484,6 +1490,8 @@ int close_ctree(struct btrfs_root *root) 
	write_ctree_super(NULL, root);

	mutex_unlock(&fs_info->fs_mutex);



	btrfs_transaction_flush_work(root);



	if (fs_info->delalloc_bytes) {

		printk("btrfs: at unmount delalloc count %Lu\n",

		       fs_info->delalloc_bytes);
@@ -1514,7 +1522,11 @@ int close_ctree(struct btrfs_root *root) 
	extent_io_tree_empty_lru(&fs_info->extent_ins);

	extent_io_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->io_tree);



	flush_workqueue(end_io_workqueue);

	flush_workqueue(async_submit_workqueue);



	truncate_inode_pages(fs_info->btree_inode->i_mapping, 0);



	flush_workqueue(end_io_workqueue);

	destroy_workqueue(end_io_workqueue);

fs/btrfs/inode.c

+6 −0
Original line number Diff line number Diff line
@@ -2524,6 +2524,12 @@ static void btrfs_invalidatepage(struct page *page, unsigned long offset) 
	tree = &BTRFS_I(page->mapping->host)->io_tree;

	extent_invalidatepage(tree, page, offset);

	btrfs_releasepage(page, GFP_NOFS);

	if (PagePrivate(page)) {

		printk("invalidate page cleaning up after releasepage\n");

		ClearPagePrivate(page);

		set_page_private(page, 0);

		page_cache_release(page);

	}

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE