aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-06-14 21:00:04 -0400
committerDavid Sterba <dsterba@suse.cz>2014-12-12 12:26:57 -0500
commitce3e69847e3ec79a38421bfd3d6f554d5e481231 (patch)
tree5c9704b1e1d3970ab098caac053cfbd06bb80f10 /fs
parent3f556f7853ec4845a7c219d026cbcdf4cfa8cea7 (diff)
btrfs: sink parameter len to alloc_extent_buffer
Because we're using globally known nodesize. Do the same for the sanity test function variant. Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c5
-rw-r--r--fs/btrfs/extent_io.c5
-rw-r--r--fs/btrfs/extent_io.h4
-rw-r--r--fs/btrfs/tests/qgroup-tests.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 548cb540e516..9c204533fd22 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1128,9 +1128,8 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
1128 u64 bytenr) 1128 u64 bytenr)
1129{ 1129{
1130 if (btrfs_test_is_dummy_root(root)) 1130 if (btrfs_test_is_dummy_root(root))
1131 return alloc_test_extent_buffer(root->fs_info, bytenr, 1131 return alloc_test_extent_buffer(root->fs_info, bytenr);
1132 root->nodesize); 1132 return alloc_extent_buffer(root->fs_info, bytenr);
1133 return alloc_extent_buffer(root->fs_info, bytenr, root->nodesize);
1134} 1133}
1135 1134
1136 1135
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index dc424e32545a..c4ca90ab687e 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4775,7 +4775,7 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,
4775 4775
4776#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS 4776#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
4777struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 4777struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
4778 u64 start, unsigned long len) 4778 u64 start)
4779{ 4779{
4780 struct extent_buffer *eb, *exists = NULL; 4780 struct extent_buffer *eb, *exists = NULL;
4781 int ret; 4781 int ret;
@@ -4821,8 +4821,9 @@ free_eb:
4821#endif 4821#endif
4822 4822
4823struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, 4823struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
4824 u64 start, unsigned long len) 4824 u64 start)
4825{ 4825{
4826 unsigned long len = fs_info->tree_root->nodesize;
4826 unsigned long num_pages = num_extent_pages(start, len); 4827 unsigned long num_pages = num_extent_pages(start, len);
4827 unsigned long i; 4828 unsigned long i;
4828 unsigned long index = start >> PAGE_CACHE_SHIFT; 4829 unsigned long index = start >> PAGE_CACHE_SHIFT;
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index e6553e3d35c8..71268e508b7a 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -262,7 +262,7 @@ int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private);
262void set_page_extent_mapped(struct page *page); 262void set_page_extent_mapped(struct page *page);
263 263
264struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, 264struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
265 u64 start, unsigned long len); 265 u64 start);
266struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info, 266struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
267 u64 start); 267 u64 start);
268struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src); 268struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src);
@@ -378,5 +378,5 @@ noinline u64 find_lock_delalloc_range(struct inode *inode,
378 u64 *end, u64 max_bytes); 378 u64 *end, u64 max_bytes);
379#endif 379#endif
380struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 380struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
381 u64 start, unsigned long len); 381 u64 start);
382#endif 382#endif
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index 7336b1c09cd8..73f299ebdabb 100644
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -419,7 +419,7 @@ int btrfs_test_qgroups(void)
419 * Can't use bytenr 0, some things freak out 419 * Can't use bytenr 0, some things freak out
420 * *cough*backref walking code*cough* 420 * *cough*backref walking code*cough*
421 */ 421 */
422 root->node = alloc_test_extent_buffer(root->fs_info, 4096, 4096); 422 root->node = alloc_test_extent_buffer(root->fs_info, 4096);
423 if (!root->node) { 423 if (!root->node) {
424 test_msg("Couldn't allocate dummy buffer\n"); 424 test_msg("Couldn't allocate dummy buffer\n");
425 ret = -ENOMEM; 425 ret = -ENOMEM;