Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 699122f5 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Don't wait on tree block writeback before freeing them anymore 



This isn't required anymore because we don't reallocate blocks that
have already been written in this transaction.

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

fs/btrfs/ctree.c

+0 −5
Original line number Diff line number Diff line
@@ -751,7 +751,6 @@ static int balance_level(struct btrfs_trans_handle *trans, 
		add_root_to_dirty_list(root);

		path->nodes[level] = NULL;

		clean_tree_block(trans, root, mid);

		wait_on_tree_block_writeback(root, mid);

		/* once for the path */

		free_extent_buffer(mid);

		ret = btrfs_free_extent(trans, root, mid->start, mid->len,
@@ -810,7 +809,6 @@ static int balance_level(struct btrfs_trans_handle *trans, 
			u32 blocksize = right->len;



			clean_tree_block(trans, root, right);

			wait_on_tree_block_writeback(root, right);

			free_extent_buffer(right);

			right = NULL;

			wret = del_ptr(trans, root, path, level + 1, pslot +
@@ -854,7 +852,6 @@ static int balance_level(struct btrfs_trans_handle *trans, 
		u64 bytenr = mid->start;

		u32 blocksize = mid->len;

		clean_tree_block(trans, root, mid);

		wait_on_tree_block_writeback(root, mid);

		free_extent_buffer(mid);

		mid = NULL;

		wret = del_ptr(trans, root, path, level + 1, pslot);
@@ -2638,7 +2635,6 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
		} else {

			u64 root_gen = btrfs_header_generation(path->nodes[1]);

			clean_tree_block(trans, root, leaf);

			wait_on_tree_block_writeback(root, leaf);

			wret = del_ptr(trans, root, path, 1, path->slots[1]);

			if (wret)

				ret = wret;
@@ -2690,7 +2686,6 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
							   path->nodes[1]);



				clean_tree_block(trans, root, leaf);

				wait_on_tree_block_writeback(root, leaf);



				wret = del_ptr(trans, root, path, 1, slot);

				if (wret)

fs/btrfs/extent-tree.c

+0 −1
Original line number Diff line number Diff line
@@ -1887,7 +1887,6 @@ struct extent_buffer *__btrfs_alloc_free_block(struct btrfs_trans_handle *trans, 
	}

	btrfs_set_header_generation(buf, trans->transid);

	clean_tree_block(trans, root, buf);

	wait_on_tree_block_writeback(root, buf);

	btrfs_set_buffer_uptodate(buf);



	if (PageDirty(buf->first_page)) {

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -383,9 +383,11 @@ int btrfs_readpage_io_hook(struct page *page, u64 start, u64 end) 
	struct btrfs_csum_item *item;

	struct btrfs_path *path = NULL;

	u32 csum;



	if (btrfs_test_opt(root, NODATASUM) ||

	    btrfs_test_flag(inode, NODATASUM))

		return 0;



	mutex_lock(&root->fs_info->fs_mutex);

	path = btrfs_alloc_path();

	item = btrfs_lookup_csum(NULL, root, path, inode->i_ino, start, 0);