Commit 4c529900 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-chris' of... 

Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
parents 8dff9c85 34b3e6c9

fs/btrfs/ctree.c

+4 −2
Original line number Diff line number Diff line
@@ -1373,7 +1373,8 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 


	if (tm->op == MOD_LOG_KEY_REMOVE_WHILE_FREEING) {

		BUG_ON(tm->slot != 0);

		eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start);

		eb_rewin = alloc_dummy_extent_buffer(fs_info, eb->start,

						eb->len);

		if (!eb_rewin) {

			btrfs_tree_read_unlock_blocking(eb);

			free_extent_buffer(eb);
@@ -1454,7 +1455,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	} else if (old_root) {

		btrfs_tree_read_unlock(eb_root);

		free_extent_buffer(eb_root);

		eb = alloc_dummy_extent_buffer(root->fs_info, logical);

		eb = alloc_dummy_extent_buffer(root->fs_info, logical,

					root->nodesize);

	} else {

		btrfs_set_lock_blocking_rw(eb_root, BTRFS_READ_LOCK);

		eb = btrfs_clone_extent_buffer(eb_root);

fs/btrfs/disk-io.c

+6 −3
Original line number Diff line number Diff line
@@ -1147,7 +1147,8 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, 
						 u64 bytenr)

{

	if (btrfs_test_is_dummy_root(root))

		return alloc_test_extent_buffer(root->fs_info, bytenr);

		return alloc_test_extent_buffer(root->fs_info, bytenr,

				root->nodesize);

	return alloc_extent_buffer(root->fs_info, bytenr);

}
@@ -1314,14 +1315,16 @@ static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info, 


#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

/* Should only be used by the testing infrastructure */

struct btrfs_root *btrfs_alloc_dummy_root(void)

struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize)

{

	struct btrfs_root *root;



	root = btrfs_alloc_root(NULL, GFP_KERNEL);

	if (!root)

		return ERR_PTR(-ENOMEM);

	__setup_root(4096, 4096, 4096, root, NULL, 1);

	/* We don't use the stripesize in selftest, set it as sectorsize */

	__setup_root(nodesize, sectorsize, sectorsize, root, NULL,

			BTRFS_ROOT_TREE_OBJECTID);

	set_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state);

	root->alloc_bytenr = 0;

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, 
void btrfs_free_fs_root(struct btrfs_root *root);



#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

struct btrfs_root *btrfs_alloc_dummy_root(void);

struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize);

#endif



/*

fs/btrfs/extent_io.c

+5 −5
Original line number Diff line number Diff line
@@ -4728,16 +4728,16 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info, 
}



struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						u64 start)

						u64 start, u32 nodesize)

{

	unsigned long len;



	if (!fs_info) {

		/*

		 * Called only from tests that don't always have a fs_info

		 * available, but we know that nodesize is 4096

		 * available

		 */

		len = 4096;

		len = nodesize;

	} else {

		len = fs_info->tree_root->nodesize;

	}
@@ -4833,7 +4833,7 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info, 


#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,

					       u64 start)

					u64 start, u32 nodesize)

{

	struct extent_buffer *eb, *exists = NULL;

	int ret;
@@ -4841,7 +4841,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 
	eb = find_extent_buffer(fs_info, start);

	if (eb)

		return eb;

	eb = alloc_dummy_extent_buffer(fs_info, start);

	eb = alloc_dummy_extent_buffer(fs_info, start, nodesize);

	if (!eb)

		return NULL;

	eb->fs_info = fs_info;

fs/btrfs/extent_io.h

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, 
struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						  u64 start, unsigned long len);

struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						u64 start);

						u64 start, u32 nodesize);

struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src);

struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,

					 u64 start);
@@ -468,5 +468,5 @@ noinline u64 find_lock_delalloc_range(struct inode *inode, 
				      u64 *end, u64 max_bytes);

#endif

struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,

					       u64 start);

					       u64 start, u32 nodesize);

#endif