Commit faa2dbf0 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason

Btrfs: add sanity tests for new qgroup accounting code

This exercises the various parts of the new qgroup accounting code.  We do some
basic stuff and do some things with the shared refs to make sure all that code
works.  I had to add a bunch of infrastructure because I needed to be able to
insert items into a fake tree without having to do all the hard work myself,
hopefully this will be usefull in the future.  Thanks,
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent fcebe456
...@@ -16,4 +16,4 @@ btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o ...@@ -16,4 +16,4 @@ btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \ btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \
tests/extent-buffer-tests.o tests/btrfs-tests.o \ tests/extent-buffer-tests.o tests/btrfs-tests.o \
tests/extent-io-tests.o tests/inode-tests.o tests/extent-io-tests.o tests/inode-tests.o tests/qgroup-tests.o
...@@ -900,7 +900,11 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, ...@@ -900,7 +900,11 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
goto out; goto out;
BUG_ON(ret == 0); BUG_ON(ret == 0);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (trans && likely(trans->type != __TRANS_DUMMY)) {
#else
if (trans) { if (trans) {
#endif
/* /*
* look if there are updates for this ref queued and lock the * look if there are updates for this ref queued and lock the
* head * head
......
...@@ -1506,6 +1506,10 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans, ...@@ -1506,6 +1506,10 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct extent_buffer *buf) struct extent_buffer *buf)
{ {
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
return 0;
#endif
/* ensure we can see the force_cow */ /* ensure we can see the force_cow */
smp_rmb(); smp_rmb();
......
...@@ -1798,6 +1798,10 @@ struct btrfs_root { ...@@ -1798,6 +1798,10 @@ struct btrfs_root {
u64 highest_objectid; u64 highest_objectid;
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
u64 alloc_bytenr;
#endif
u64 defrag_trans_start; u64 defrag_trans_start;
struct btrfs_key defrag_progress; struct btrfs_key defrag_progress;
struct btrfs_key defrag_max; struct btrfs_key defrag_max;
...@@ -4111,6 +4115,8 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) ...@@ -4111,6 +4115,8 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)
/* Sanity test specific functions */ /* Sanity test specific functions */
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
void btrfs_test_destroy_inode(struct inode *inode); void btrfs_test_destroy_inode(struct inode *inode);
int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
u64 rfer, u64 excl);
#endif #endif
#endif #endif
...@@ -1110,6 +1110,11 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, ...@@ -1110,6 +1110,11 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,
struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
u64 bytenr, u32 blocksize) u64 bytenr, u32 blocksize)
{ {
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
return alloc_test_extent_buffer(root->fs_info, bytenr,
blocksize);
#endif
return alloc_extent_buffer(root->fs_info, bytenr, blocksize); return alloc_extent_buffer(root->fs_info, bytenr, blocksize);
} }
...@@ -1288,6 +1293,7 @@ struct btrfs_root *btrfs_alloc_dummy_root(void) ...@@ -1288,6 +1293,7 @@ struct btrfs_root *btrfs_alloc_dummy_root(void)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
__setup_root(4096, 4096, 4096, 4096, root, NULL, 1); __setup_root(4096, 4096, 4096, 4096, root, NULL, 1);
set_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state); set_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state);
root->alloc_bytenr = 0;
return root; return root;
} }
...@@ -2089,7 +2095,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root) ...@@ -2089,7 +2095,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
free_root_extent_buffers(info->chunk_root); free_root_extent_buffers(info->chunk_root);
} }
static void del_fs_roots(struct btrfs_fs_info *fs_info) void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info)
{ {
int ret; int ret;
struct btrfs_root *gang[8]; struct btrfs_root *gang[8];
...@@ -2969,7 +2975,7 @@ int open_ctree(struct super_block *sb, ...@@ -2969,7 +2975,7 @@ int open_ctree(struct super_block *sb,
fail_trans_kthread: fail_trans_kthread:
kthread_stop(fs_info->transaction_kthread); kthread_stop(fs_info->transaction_kthread);
btrfs_cleanup_transaction(fs_info->tree_root); btrfs_cleanup_transaction(fs_info->tree_root);
del_fs_roots(fs_info); btrfs_free_fs_roots(fs_info);
fail_cleaner: fail_cleaner:
kthread_stop(fs_info->cleaner_kthread); kthread_stop(fs_info->cleaner_kthread);
...@@ -3504,7 +3510,9 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, ...@@ -3504,7 +3510,9 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,
if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
btrfs_free_log(NULL, root); btrfs_free_log(NULL, root);
if (root->free_ino_pinned)
__btrfs_remove_free_space_cache(root->free_ino_pinned); __btrfs_remove_free_space_cache(root->free_ino_pinned);
if (root->free_ino_ctl)
__btrfs_remove_free_space_cache(root->free_ino_ctl); __btrfs_remove_free_space_cache(root->free_ino_ctl);
free_fs_root(root); free_fs_root(root);
} }
...@@ -3655,7 +3663,7 @@ int close_ctree(struct btrfs_root *root) ...@@ -3655,7 +3663,7 @@ int close_ctree(struct btrfs_root *root)
btrfs_sysfs_remove_one(fs_info); btrfs_sysfs_remove_one(fs_info);
del_fs_roots(fs_info); btrfs_free_fs_roots(fs_info);
btrfs_put_block_group_cache(fs_info); btrfs_put_block_group_cache(fs_info);
......
...@@ -68,6 +68,7 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root, ...@@ -68,6 +68,7 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,
int btrfs_init_fs_root(struct btrfs_root *root); int btrfs_init_fs_root(struct btrfs_root *root);
int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,
struct btrfs_root *root); struct btrfs_root *root);
void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info);
struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
struct btrfs_key *key, struct btrfs_key *key,
......
...@@ -2992,6 +2992,10 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, ...@@ -2992,6 +2992,10 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
int (*process_func)(struct btrfs_trans_handle *, struct btrfs_root *, int (*process_func)(struct btrfs_trans_handle *, struct btrfs_root *,
u64, u64, u64, u64, u64, u64, int); u64, u64, u64, u64, u64, u64, int);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
return 0;
#endif
ref_root = btrfs_header_owner(buf); ref_root = btrfs_header_owner(buf);
nritems = btrfs_header_nritems(buf); nritems = btrfs_header_nritems(buf);
level = btrfs_header_level(buf); level = btrfs_header_level(buf);
...@@ -6151,6 +6155,10 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root, ...@@ -6151,6 +6155,10 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root,
int ret; int ret;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
return 0;
#endif
add_pinned_bytes(root->fs_info, num_bytes, owner, root_objectid); add_pinned_bytes(root->fs_info, num_bytes, owner, root_objectid);
/* /*
...@@ -7157,6 +7165,15 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, ...@@ -7157,6 +7165,15 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
bool skinny_metadata = btrfs_fs_incompat(root->fs_info, bool skinny_metadata = btrfs_fs_incompat(root->fs_info,
SKINNY_METADATA); SKINNY_METADATA);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state))) {
buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr,
blocksize, level);
if (!IS_ERR(buf))
root->alloc_bytenr += blocksize;
return buf;
}
#endif
block_rsv = use_block_rsv(trans, root, blocksize); block_rsv = use_block_rsv(trans, root, blocksize);
if (IS_ERR(block_rsv)) if (IS_ERR(block_rsv))
return ERR_CAST(block_rsv); return ERR_CAST(block_rsv);
......
...@@ -4549,6 +4549,53 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info, ...@@ -4549,6 +4549,53 @@ struct extent_buffer *find_extent_buffer(struct btrfs_fs_info *fs_info,
return NULL; return NULL;
} }
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
u64 start, unsigned long len)
{
struct extent_buffer *eb, *exists = NULL;
int ret;
eb = find_extent_buffer(fs_info, start);
if (eb)
return eb;
eb = alloc_dummy_extent_buffer(start, len);
if (!eb)
return NULL;
eb->fs_info = fs_info;
again:
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
if (ret)
goto free_eb;
spin_lock(&fs_info->buffer_lock);
ret = radix_tree_insert(&fs_info->buffer_radix,
start >> PAGE_CACHE_SHIFT, eb);
spin_unlock(&fs_info->buffer_lock);
radix_tree_preload_end();
if (ret == -EEXIST) {
exists = find_extent_buffer(fs_info, start);
if (exists)
goto free_eb;
else
goto again;
}
check_buffer_tree_ref(eb);
set_bit(EXTENT_BUFFER_IN_TREE, &eb->bflags);
/*
* We will free dummy extent buffer's if they come into
* free_extent_buffer with a ref count of 2, but if we are using this we
* want the buffers to stay in memory until we're done with them, so
* bump the ref count again.
*/
atomic_inc(&eb->refs);
return eb;
free_eb:
btrfs_release_extent_buffer(eb);
return exists;
}
#endif
struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
u64 start, unsigned long len) u64 start, unsigned long len)
{ {
......
...@@ -350,5 +350,7 @@ noinline u64 find_lock_delalloc_range(struct inode *inode, ...@@ -350,5 +350,7 @@ noinline u64 find_lock_delalloc_range(struct inode *inode,
struct extent_io_tree *tree, struct extent_io_tree *tree,
struct page *locked_page, u64 *start, struct page *locked_page, u64 *start,
u64 *end, u64 max_bytes); u64 *end, u64 max_bytes);
struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
u64 start, unsigned long len);
#endif #endif
#endif #endif
...@@ -246,6 +246,21 @@ static int del_relation_rb(struct btrfs_fs_info *fs_info, ...@@ -246,6 +246,21 @@ static int del_relation_rb(struct btrfs_fs_info *fs_info,
return -ENOENT; return -ENOENT;
} }
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
u64 rfer, u64 excl)
{
struct btrfs_qgroup *qgroup;
qgroup = find_qgroup_rb(fs_info, qgroupid);
if (!qgroup)
return -EINVAL;
if (qgroup->rfer != rfer || qgroup->excl != excl)
return -EINVAL;
return 0;
}
#endif
/* /*
* The full config is read in one go, only called from open_ctree() * The full config is read in one go, only called from open_ctree()
* It doesn't use any locking, as at this point we're still single-threaded * It doesn't use any locking, as at this point we're still single-threaded
...@@ -524,6 +539,10 @@ static int add_qgroup_item(struct btrfs_trans_handle *trans, ...@@ -524,6 +539,10 @@ static int add_qgroup_item(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct btrfs_key key; struct btrfs_key key;
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &quota_root->state)))
return 0;
#endif
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
...@@ -673,6 +692,10 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans, ...@@ -673,6 +692,10 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans,
int ret; int ret;
int slot; int slot;
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
return 0;
#endif
key.objectid = 0; key.objectid = 0;
key.type = BTRFS_QGROUP_INFO_KEY; key.type = BTRFS_QGROUP_INFO_KEY;
key.offset = qgroup->qgroupid; key.offset = qgroup->qgroupid;
......
...@@ -1895,6 +1895,9 @@ static int btrfs_run_sanity_tests(void) ...@@ -1895,6 +1895,9 @@ static int btrfs_run_sanity_tests(void)
if (ret) if (ret)
goto out; goto out;
ret = btrfs_test_inodes(); ret = btrfs_test_inodes();
if (ret)
goto out;
ret = btrfs_test_qgroups();
out: out:
btrfs_destroy_test_fs(); btrfs_destroy_test_fs();
return ret; return ret;
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#include <linux/magic.h> #include <linux/magic.h>
#include "btrfs-tests.h" #include "btrfs-tests.h"
#include "../ctree.h" #include "../ctree.h"
#include "../volumes.h"
#include "../disk-io.h"
#include "../qgroup.h"
static struct vfsmount *test_mnt = NULL; static struct vfsmount *test_mnt = NULL;
...@@ -72,3 +75,97 @@ void btrfs_destroy_test_fs(void) ...@@ -72,3 +75,97 @@ void btrfs_destroy_test_fs(void)
kern_unmount(test_mnt); kern_unmount(test_mnt);
unregister_filesystem(&test_type); unregister_filesystem(&test_type);
} }
struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(void)
{
struct btrfs_fs_info *fs_info = kzalloc(sizeof(struct btrfs_fs_info),
GFP_NOFS);
if (!fs_info)
return fs_info;
fs_info->fs_devices = kzalloc(sizeof(struct btrfs_fs_devices),
GFP_NOFS);
if (!fs_info->fs_devices) {
kfree(fs_info);
return NULL;
}
fs_info->super_copy = kzalloc(sizeof(struct btrfs_super_block),
GFP_NOFS);
if (!fs_info->super_copy) {
kfree(fs_info->fs_devices);
kfree(fs_info);
return NULL;
}
if (init_srcu_struct(&fs_info->subvol_srcu)) {
kfree(fs_info->fs_devices);
kfree(fs_info->super_copy);
kfree(fs_info);
return NULL;
}
spin_lock_init(&fs_info->buffer_lock);
spin_lock_init(&fs_info->qgroup_lock);
spin_lock_init(&fs_info->qgroup_op_lock);
spin_lock_init(&fs_info->super_lock);
spin_lock_init(&fs_info->fs_roots_radix_lock);
spin_lock_init(&fs_info->tree_mod_seq_lock);
mutex_init(&fs_info->qgroup_ioctl_lock);
mutex_init(&fs_info->qgroup_rescan_lock);
rwlock_init(&fs_info->tree_mod_log_lock);
fs_info->running_transaction = NULL;
fs_info->qgroup_tree = RB_ROOT;
fs_info->qgroup_ulist = NULL;
atomic64_set(&fs_info->tree_mod_seq, 0);
INIT_LIST_HEAD(&fs_info->dirty_qgroups);
INIT_LIST_HEAD(&fs_info->dead_roots);
INIT_LIST_HEAD(&fs_info->tree_mod_seq_list);
INIT_RADIX_TREE(&fs_info->buffer_radix, GFP_ATOMIC);
INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_ATOMIC);
return fs_info;
}
static void btrfs_free_dummy_fs_info(struct btrfs_fs_info *fs_info)
{
struct radix_tree_iter iter;
void **slot;
spin_lock(&fs_info->buffer_lock);
restart:
radix_tree_for_each_slot(slot, &fs_info->buffer_radix, &iter, 0) {
struct extent_buffer *eb;
eb = radix_tree_deref_slot(slot);
if (!eb)
continue;
/* Shouldn't happen but that kind of thinking creates CVE's */
if (radix_tree_exception(eb)) {
if (radix_tree_deref_retry(eb))
goto restart;
continue;
}
spin_unlock(&fs_info->buffer_lock);
free_extent_buffer_stale(eb);
spin_lock(&fs_info->buffer_lock);
}
spin_unlock(&fs_info->buffer_lock);
btrfs_free_qgroup_config(fs_info);
btrfs_free_fs_roots(fs_info);
cleanup_srcu_struct(&fs_info->subvol_srcu);
kfree(fs_info->super_copy);
kfree(fs_info->fs_devices);
kfree(fs_info);
}
void btrfs_free_dummy_root(struct btrfs_root *root)
{
if (!root)
return;
if (root->node)
free_extent_buffer(root->node);
if (root->fs_info)
btrfs_free_dummy_fs_info(root->fs_info);
kfree(root);
}
...@@ -23,13 +23,18 @@ ...@@ -23,13 +23,18 @@
#define test_msg(fmt, ...) pr_info("BTRFS: selftest: " fmt, ##__VA_ARGS__) #define test_msg(fmt, ...) pr_info("BTRFS: selftest: " fmt, ##__VA_ARGS__)
struct btrfs_root;
int btrfs_test_free_space_cache(void); int btrfs_test_free_space_cache(void);
int btrfs_test_extent_buffer_operations(void); int btrfs_test_extent_buffer_operations(void);
int btrfs_test_extent_io(void); int btrfs_test_extent_io(void);
int btrfs_test_inodes(void); int btrfs_test_inodes(void);
int btrfs_test_qgroups(void);
int btrfs_init_test_fs(void); int btrfs_init_test_fs(void);
void btrfs_destroy_test_fs(void); void btrfs_destroy_test_fs(void);
struct inode *btrfs_new_test_inode(void); struct inode *btrfs_new_test_inode(void);
struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(void);
void btrfs_free_dummy_root(struct btrfs_root *root);
#else #else
static inline int btrfs_test_free_space_cache(void) static inline int btrfs_test_free_space_cache(void)
{ {
...@@ -54,6 +59,10 @@ static inline int btrfs_test_inodes(void) ...@@ -54,6 +59,10 @@ static inline int btrfs_test_inodes(void)
{ {
return 0; return 0;
} }
static inline int btrfs_test_qgroups(void)
{
return 0;
}
#endif #endif
#endif #endif
...@@ -23,33 +23,6 @@ ...@@ -23,33 +23,6 @@
#include "../extent_io.h" #include "../extent_io.h"
#include "../volumes.h" #include "../volumes.h"
static struct btrfs_fs_info *alloc_dummy_fs_info(void)
{
struct btrfs_fs_info *fs_info = kzalloc(sizeof(struct btrfs_fs_info),
GFP_NOFS);
if (!fs_info)
return fs_info;
fs_info->fs_devices = kzalloc(sizeof(struct btrfs_fs_devices),
GFP_NOFS);
if (!fs_info->fs_devices) {
kfree(fs_info);
return NULL;
}
return fs_info;
}
static void free_dummy_root(struct btrfs_root *root)
{
if (!root)
return;
if (root->fs_info) {
kfree(root->fs_info->fs_devices);
kfree(root->fs_info);
}
if (root->node)
free_extent_buffer(root->node);
kfree(root);
}
static void insert_extent(struct btrfs_root *root, u64 start, u64 len, static void insert_extent(struct btrfs_root *root, u64 start, u64 len,
u64 ram_bytes, u64 offset, u64 disk_bytenr, u64 ram_bytes, u64 offset, u64 disk_bytenr,
u64 disk_len, u32 type, u8 compression, int slot) u64 disk_len, u32 type, u8 compression, int slot)
...@@ -276,7 +249,7 @@ static noinline int test_btrfs_get_extent(void) ...@@ -276,7 +249,7 @@ static noinline int test_btrfs_get_extent(void)
* We do this since btrfs_get_extent wants to assign em->bdev to * We do this since btrfs_get_extent wants to assign em->bdev to
* root->fs_info->fs_devices->latest_bdev. * root->fs_info->fs_devices->latest_bdev.
*/ */
root->fs_info = alloc_dummy_fs_info(); root->fs_info = btrfs_alloc_dummy_fs_info();
if (!root->fs_info) { if (!root->fs_info) {
test_msg("Couldn't allocate dummy fs info\n"); test_msg("Couldn't allocate dummy fs info\n");
goto out; goto out;
...@@ -837,7 +810,7 @@ static noinline int test_btrfs_get_extent(void) ...@@ -837,7 +810,7 @@ static noinline int test_btrfs_get_extent(void)
if (!IS_ERR(em)) if (!IS_ERR(em))
free_extent_map(em); free_extent_map(em);
iput(inode); iput(inode);
free_dummy_root(root); btrfs_free_dummy_root(root);
return ret; return ret;
} }
...@@ -864,7 +837,7 @@ static int test_hole_first(void) ...@@ -864,7 +837,7 @@ static int test_hole_first(void)
goto out; goto out;
} }
root->fs_info = alloc_dummy_fs_info(); root->fs_info = btrfs_alloc_dummy_fs_info();
if (!root->fs_info) { if (!root->fs_info) {
test_msg("Couldn't allocate dummy fs info\n"); test_msg("Couldn't allocate dummy fs info\n");
goto out; goto out;
...@@ -934,7 +907,7 @@ static int test_hole_first(void) ...@@ -934,7 +907,7 @@ static int test_hole_first(void)
if (!IS_ERR(em)) if (!IS_ERR(em))
free_extent_map(em); free_extent_map(em);
iput(inode); iput(inode);
free_dummy_root(root); btrfs_free_dummy_root(root);
return ret; return ret;
} }
......
This diff is collapsed.
...@@ -69,6 +69,7 @@ struct btrfs_transaction { ...@@ -69,6 +69,7 @@ struct btrfs_transaction {
#define __TRANS_ATTACH (1U << 10) #define __TRANS_ATTACH (1U << 10)
#define __TRANS_JOIN (1U << 11) #define __TRANS_JOIN (1U << 11)
#define __TRANS_JOIN_NOLOCK (1U << 12) #define __TRANS_JOIN_NOLOCK (1U << 12)
#define __TRANS_DUMMY (1U << 13)
#define TRANS_USERSPACE (__TRANS_USERSPACE | __TRANS_FREEZABLE) #define TRANS_USERSPACE (__TRANS_USERSPACE | __TRANS_FREEZABLE)
#define TRANS_START (__TRANS_START | __TRANS_FREEZABLE) #define TRANS_START (__TRANS_START | __TRANS_FREEZABLE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment