Commit 27b19cc8 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanup/blocksize-diet-part1' of... 

Merge branch 'cleanup/blocksize-diet-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
parents bbf65cf0 4d75f8a9

fs/btrfs/backref.c

+2 −4
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
			continue;

		BUG_ON(!ref->wanted_disk_byte);

		eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte,

				     fs_info->tree_root->nodesize, 0);

				     0);

		if (!eb || !extent_buffer_uptodate(eb)) {

			free_extent_buffer(eb);

			return -EIO;
@@ -1028,12 +1028,10 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
		if (ref->count && ref->parent) {

			if (extent_item_pos && !ref->inode_list &&

			    ref->level == 0) {

				u32 bsz;

				struct extent_buffer *eb;



				bsz = fs_info->extent_root->nodesize;

				eb = read_tree_block(fs_info->extent_root,

							   ref->parent, bsz, 0);

							   ref->parent, 0);

				if (!eb || !extent_buffer_uptodate(eb)) {

					free_extent_buffer(eb);

					ret = -EIO;

fs/btrfs/ctree.c

+22 −32
Original line number Diff line number Diff line
@@ -258,9 +258,8 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 
	else

		btrfs_node_key(buf, &disk_key, 0);



	cow = btrfs_alloc_free_block(trans, root, buf->len, 0,

				     new_root_objectid, &disk_key, level,

				     buf->start, 0);

	cow = btrfs_alloc_tree_block(trans, root, 0, new_root_objectid,

			&disk_key, level, buf->start, 0);

	if (IS_ERR(cow))

		return PTR_ERR(cow);
@@ -1133,9 +1132,9 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
	} else

		parent_start = 0;



	cow = btrfs_alloc_free_block(trans, root, buf->len, parent_start,

				     root->root_key.objectid, &disk_key,

				     level, search_start, empty_size);

	cow = btrfs_alloc_tree_block(trans, root, parent_start,

			root->root_key.objectid, &disk_key, level,

			search_start, empty_size);

	if (IS_ERR(cow))

		return PTR_ERR(cow);
@@ -1425,7 +1424,6 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	struct tree_mod_root *old_root = NULL;

	u64 old_generation = 0;

	u64 logical;

	u32 blocksize;



	eb_root = btrfs_read_lock_root_node(root);

	tm = __tree_mod_log_oldest_root(root->fs_info, eb_root, time_seq);
@@ -1444,8 +1442,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	if (old_root && tm && tm->op != MOD_LOG_KEY_REMOVE_WHILE_FREEING) {

		btrfs_tree_read_unlock(eb_root);

		free_extent_buffer(eb_root);

		blocksize = root->nodesize;

		old = read_tree_block(root, logical, blocksize, 0);

		old = read_tree_block(root, logical, 0);

		if (WARN_ON(!old || !extent_buffer_uptodate(old))) {

			free_extent_buffer(old);

			btrfs_warn(root->fs_info,
@@ -1684,15 +1681,14 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
			continue;

		}



		cur = btrfs_find_tree_block(root, blocknr, blocksize);

		cur = btrfs_find_tree_block(root, blocknr);

		if (cur)

			uptodate = btrfs_buffer_uptodate(cur, gen, 0);

		else

			uptodate = 0;

		if (!cur || !uptodate) {

			if (!cur) {

				cur = read_tree_block(root, blocknr,

							 blocksize, gen);

				cur = read_tree_block(root, blocknr, gen);

				if (!cur || !extent_buffer_uptodate(cur)) {

					free_extent_buffer(cur);

					return -EIO;
@@ -1871,7 +1867,6 @@ static noinline struct extent_buffer *read_node_slot(struct btrfs_root *root, 
	BUG_ON(level == 0);



	eb = read_tree_block(root, btrfs_node_blockptr(parent, slot),

			     root->nodesize,

			     btrfs_node_ptr_generation(parent, slot));

	if (eb && !extent_buffer_uptodate(eb)) {

		free_extent_buffer(eb);
@@ -2267,7 +2262,7 @@ static void reada_for_search(struct btrfs_root *root, 


	search = btrfs_node_blockptr(node, slot);

	blocksize = root->nodesize;

	eb = btrfs_find_tree_block(root, search, blocksize);

	eb = btrfs_find_tree_block(root, search);

	if (eb) {

		free_extent_buffer(eb);

		return;
@@ -2297,7 +2292,7 @@ static void reada_for_search(struct btrfs_root *root, 
		if ((search <= target && target - search <= 65536) ||

		    (search > target && search - target <= 65536)) {

			gen = btrfs_node_ptr_generation(node, nr);

			readahead_tree_block(root, search, blocksize, gen);

			readahead_tree_block(root, search, blocksize);

			nread += blocksize;

		}

		nscan++;
@@ -2329,7 +2324,7 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	if (slot > 0) {

		block1 = btrfs_node_blockptr(parent, slot - 1);

		gen = btrfs_node_ptr_generation(parent, slot - 1);

		eb = btrfs_find_tree_block(root, block1, blocksize);

		eb = btrfs_find_tree_block(root, block1);

		/*

		 * if we get -eagain from btrfs_buffer_uptodate, we

		 * don't want to return eagain here.  That will loop
@@ -2342,16 +2337,16 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	if (slot + 1 < nritems) {

		block2 = btrfs_node_blockptr(parent, slot + 1);

		gen = btrfs_node_ptr_generation(parent, slot + 1);

		eb = btrfs_find_tree_block(root, block2, blocksize);

		eb = btrfs_find_tree_block(root, block2);

		if (eb && btrfs_buffer_uptodate(eb, gen, 1) != 0)

			block2 = 0;

		free_extent_buffer(eb);

	}



	if (block1)

		readahead_tree_block(root, block1, blocksize, 0);

		readahead_tree_block(root, block1, blocksize);

	if (block2)

		readahead_tree_block(root, block2, blocksize, 0);

		readahead_tree_block(root, block2, blocksize);

}
@@ -2453,16 +2448,14 @@ read_block_for_search(struct btrfs_trans_handle *trans, 
{

	u64 blocknr;

	u64 gen;

	u32 blocksize;

	struct extent_buffer *b = *eb_ret;

	struct extent_buffer *tmp;

	int ret;



	blocknr = btrfs_node_blockptr(b, slot);

	gen = btrfs_node_ptr_generation(b, slot);

	blocksize = root->nodesize;



	tmp = btrfs_find_tree_block(root, blocknr, blocksize);

	tmp = btrfs_find_tree_block(root, blocknr);

	if (tmp) {

		/* first we do an atomic uptodate check */

		if (btrfs_buffer_uptodate(tmp, gen, 1) > 0) {
@@ -2506,7 +2499,7 @@ read_block_for_search(struct btrfs_trans_handle *trans, 
	btrfs_release_path(p);



	ret = -EAGAIN;

	tmp = read_tree_block(root, blocknr, blocksize, 0);

	tmp = read_tree_block(root, blocknr, 0);

	if (tmp) {

		/*

		 * If the read above didn't mark this buffer up to date,
@@ -3360,9 +3353,8 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 
	else

		btrfs_node_key(lower, &lower_key, 0);



	c = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

				   root->root_key.objectid, &lower_key,

				   level, root->node->start, 0);

	c = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

				   &lower_key, level, root->node->start, 0);

	if (IS_ERR(c))

		return PTR_ERR(c);
@@ -3500,8 +3492,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, 
	mid = (c_nritems + 1) / 2;

	btrfs_node_key(c, &disk_key, mid);



	split = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

					root->root_key.objectid,

	split = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

			&disk_key, level, c->start, 0);

	if (IS_ERR(split))

		return PTR_ERR(split);
@@ -4280,8 +4271,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 
	else

		btrfs_item_key(l, &disk_key, mid);



	right = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

					root->root_key.objectid,

	right = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

			&disk_key, 0, l->start, 0);

	if (IS_ERR(right))

		return PTR_ERR(right);

fs/btrfs/ctree.h

+3 −3
Original line number Diff line number Diff line
@@ -3291,9 +3291,9 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group( 
						 u64 bytenr);

void btrfs_put_block_group(struct btrfs_block_group_cache *cache);

int get_block_group_index(struct btrfs_block_group_cache *cache);

struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,

					struct btrfs_root *root, u32 blocksize,

					u64 parent, u64 root_objectid,

struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,

					struct btrfs_root *root, u64 parent,

					u64 root_objectid,

					struct btrfs_disk_key *key, int level,

					u64 hint, u64 empty_size);

void btrfs_free_tree_block(struct btrfs_trans_handle *trans,

fs/btrfs/disk-io.c

+12 −25
Original line number Diff line number Diff line
@@ -1073,20 +1073,17 @@ static const struct address_space_operations btree_aops = { 
	.set_page_dirty = btree_set_page_dirty,

};



int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 u64 parent_transid)

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)

{

	struct extent_buffer *buf = NULL;

	struct inode *btree_inode = root->fs_info->btree_inode;

	int ret = 0;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	if (!buf)

		return 0;

		return;

	read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,

				 buf, 0, WAIT_NONE, btree_get_extent, 0);

	free_extent_buffer(buf);

	return ret;

}



int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
@@ -1122,7 +1119,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, 
}



struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,

					    u64 bytenr, u32 blocksize)

					    u64 bytenr)

{

	return find_extent_buffer(root->fs_info, bytenr);

}
@@ -1150,12 +1147,12 @@ int btrfs_wait_tree_block_writeback(struct extent_buffer *buf) 
}



struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u32 blocksize, u64 parent_transid)

				      u64 parent_transid)

{

	struct extent_buffer *buf = NULL;

	int ret;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	buf = btrfs_find_create_tree_block(root, bytenr, root->nodesize);

	if (!buf)

		return NULL;
@@ -1336,8 +1333,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
	root->root_key.type = BTRFS_ROOT_ITEM_KEY;

	root->root_key.offset = 0;



	leaf = btrfs_alloc_free_block(trans, root, root->nodesize,

				      0, objectid, NULL, 0, 0, 0);

	leaf = btrfs_alloc_tree_block(trans, root, 0, objectid, NULL, 0, 0, 0);

	if (IS_ERR(leaf)) {

		ret = PTR_ERR(leaf);

		leaf = NULL;
@@ -1424,9 +1420,8 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, 
	 * updated (along with back refs to the log tree).

	 */



	leaf = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

				      BTRFS_TREE_LOG_OBJECTID, NULL,

				      0, 0, 0);

	leaf = btrfs_alloc_tree_block(trans, root, 0, BTRFS_TREE_LOG_OBJECTID,

			NULL, 0, 0, 0);

	if (IS_ERR(leaf)) {

		kfree(root);

		return ERR_CAST(leaf);
@@ -1496,7 +1491,6 @@ static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, 
	struct btrfs_fs_info *fs_info = tree_root->fs_info;

	struct btrfs_path *path;

	u64 generation;

	u32 blocksize;

	int ret;



	path = btrfs_alloc_path();
@@ -1521,9 +1515,8 @@ static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, 
	}



	generation = btrfs_root_generation(&root->root_item);

	blocksize = root->nodesize;

	root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),

				     blocksize, generation);

				     generation);

	if (!root->node) {

		ret = -ENOMEM;

		goto find_fail;
@@ -2151,7 +2144,6 @@ int open_ctree(struct super_block *sb, 
{

	u32 sectorsize;

	u32 nodesize;

	u32 blocksize;

	u32 stripesize;

	u64 generation;

	u64 features;
@@ -2655,7 +2647,6 @@ int open_ctree(struct super_block *sb, 
		goto fail_sb_buffer;

	}



	blocksize = tree_root->nodesize;

	generation = btrfs_super_chunk_root_generation(disk_super);



	__setup_root(nodesize, sectorsize, stripesize, chunk_root,
@@ -2663,7 +2654,7 @@ int open_ctree(struct super_block *sb, 


	chunk_root->node = read_tree_block(chunk_root,

					   btrfs_super_chunk_root(disk_super),

					   blocksize, generation);

					   generation);

	if (!chunk_root->node ||

	    !test_bit(EXTENT_BUFFER_UPTODATE, &chunk_root->node->bflags)) {

		printk(KERN_WARNING "BTRFS: failed to read chunk root on %s\n",
@@ -2696,12 +2687,11 @@ int open_ctree(struct super_block *sb, 
	}



retry_root_backup:

	blocksize = tree_root->nodesize;

	generation = btrfs_super_generation(disk_super);



	tree_root->node = read_tree_block(tree_root,

					  btrfs_super_root(disk_super),

					  blocksize, generation);

					  generation);

	if (!tree_root->node ||

	    !test_bit(EXTENT_BUFFER_UPTODATE, &tree_root->node->bflags)) {

		printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n",
@@ -2870,7 +2860,6 @@ int open_ctree(struct super_block *sb, 
			err = -EIO;

			goto fail_qgroup;

		}

		blocksize = tree_root->nodesize;



		log_tree_root = btrfs_alloc_root(fs_info);

		if (!log_tree_root) {
@@ -2882,7 +2871,6 @@ int open_ctree(struct super_block *sb, 
			     log_tree_root, fs_info, BTRFS_TREE_LOG_OBJECTID);



		log_tree_root->node = read_tree_block(tree_root, bytenr,

						      blocksize,

						      generation + 1);

		if (!log_tree_root->node ||

		    !extent_buffer_uptodate(log_tree_root->node)) {
@@ -4084,8 +4072,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root, 


		clear_extent_bits(dirty_pages, start, end, mark, GFP_NOFS);

		while (start <= end) {

			eb = btrfs_find_tree_block(root, start,

						   root->nodesize);

			eb = btrfs_find_tree_block(root, start);

			start += root->nodesize;

			if (!eb)

				continue;

fs/btrfs/disk-io.h

+3 −4
Original line number Diff line number Diff line
@@ -45,9 +45,8 @@ struct btrfs_device; 
struct btrfs_fs_devices;



struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u32 blocksize, u64 parent_transid);

int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,

				      u64 parent_transid);

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize);

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
@@ -63,7 +62,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans, 
struct buffer_head *btrfs_read_dev_super(struct block_device *bdev);

int btrfs_commit_super(struct btrfs_root *root);

struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,

					    u64 bytenr, u32 blocksize);

					    u64 bytenr);

struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,

				      struct btrfs_key *location);

int btrfs_init_fs_root(struct btrfs_root *root);