btrfs: tests, move initialization into tests/

We have all these stubs that only exist because they're called from
btrfs_run_sanity_tests, which is a static inside super.c.  Let's just
move it all into tests/btrfs-tests.c and only have one stub.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4a0c0aeb00418ac2c7a6d81c1132faeb4e1c5fe0..959823a12c42d799411e098b1d8a7bd0f9b43d2d 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2342,49 +2342,6 @@ static void btrfs_print_mod_info(void)
                        btrfs_crc32c_impl());
 }
 
-static int btrfs_run_sanity_tests(void)
-{
-       int ret, i;
-       u32 sectorsize, nodesize;
-       u32 test_sectorsize[] = {
-               PAGE_SIZE,
-       };
-       ret = btrfs_init_test_fs();
-       if (ret)
-               return ret;
-       for (i = 0; i < ARRAY_SIZE(test_sectorsize); i++) {
-               sectorsize = test_sectorsize[i];
-               for (nodesize = sectorsize;
-                    nodesize <= BTRFS_MAX_METADATA_BLOCKSIZE;
-                    nodesize <<= 1) {
-                       pr_info("BTRFS: selftest: sectorsize: %u  nodesize: %u\n",
-                               sectorsize, nodesize);
-                       ret = btrfs_test_free_space_cache(sectorsize, nodesize);
-                       if (ret)
-                               goto out;
-                       ret = btrfs_test_extent_buffer_operations(sectorsize,
-                               nodesize);
-                       if (ret)
-                               goto out;
-                       ret = btrfs_test_extent_io(sectorsize, nodesize);
-                       if (ret)
-                               goto out;
-                       ret = btrfs_test_inodes(sectorsize, nodesize);
-                       if (ret)
-                               goto out;
-                       ret = btrfs_test_qgroups(sectorsize, nodesize);
-                       if (ret)
-                               goto out;
-                       ret = btrfs_test_free_space_tree(sectorsize, nodesize);
-                       if (ret)
-                               goto out;
-               }
-       }
-out:
-       btrfs_destroy_test_fs();
-       return ret;
-}
-
 static int __init init_btrfs_fs(void)
 {
        int err;

diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index 02223f3f78f4b54bc1fca294d71ac75b0e61b2ce..71d9a01293474e19c648ed78d8968ec42da8c616 100644 (file)
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -54,7 +54,7 @@ struct inode *btrfs_new_test_inode(void)
        return new_inode(test_mnt->mnt_sb);
 }
 
-int btrfs_init_test_fs(void)
+static int btrfs_init_test_fs(void)
 {
        int ret;
 
@@ -73,7 +73,7 @@ int btrfs_init_test_fs(void)
        return 0;
 }
 
-void btrfs_destroy_test_fs(void)
+static void btrfs_destroy_test_fs(void)
 {
        kern_unmount(test_mnt);
        unregister_filesystem(&test_type);
@@ -220,3 +220,46 @@ void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans)
        INIT_LIST_HEAD(&trans->qgroup_ref_list);
        trans->type = __TRANS_DUMMY;
 }
+
+int btrfs_run_sanity_tests(void)
+{
+       int ret, i;
+       u32 sectorsize, nodesize;
+       u32 test_sectorsize[] = {
+               PAGE_SIZE,
+       };
+       ret = btrfs_init_test_fs();
+       if (ret)
+               return ret;
+       for (i = 0; i < ARRAY_SIZE(test_sectorsize); i++) {
+               sectorsize = test_sectorsize[i];
+               for (nodesize = sectorsize;
+                    nodesize <= BTRFS_MAX_METADATA_BLOCKSIZE;
+                    nodesize <<= 1) {
+                       pr_info("BTRFS: selftest: sectorsize: %u  nodesize: %u\n",
+                               sectorsize, nodesize);
+                       ret = btrfs_test_free_space_cache(sectorsize, nodesize);
+                       if (ret)
+                               goto out;
+                       ret = btrfs_test_extent_buffer_operations(sectorsize,
+                               nodesize);
+                       if (ret)
+                               goto out;
+                       ret = btrfs_test_extent_io(sectorsize, nodesize);
+                       if (ret)
+                               goto out;
+                       ret = btrfs_test_inodes(sectorsize, nodesize);
+                       if (ret)
+                               goto out;
+                       ret = btrfs_test_qgroups(sectorsize, nodesize);
+                       if (ret)
+                               goto out;
+                       ret = btrfs_test_free_space_tree(sectorsize, nodesize);
+                       if (ret)
+                               goto out;
+               }
+       }
+out:
+       btrfs_destroy_test_fs();
+       return ret;
+}

diff --git a/fs/btrfs/tests/btrfs-tests.h b/fs/btrfs/tests/btrfs-tests.h
index 66fb6b701eb72975fa203fd4018ae847cffd46ab..e7d364f315db270019a4e269dfbce24cdb49b823 100644 (file)
--- a/fs/btrfs/tests/btrfs-tests.h
+++ b/fs/btrfs/tests/btrfs-tests.h
@@ -20,20 +20,19 @@
 #define __BTRFS_TESTS
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
+int btrfs_run_sanity_tests(void);
 
 #define test_msg(fmt, ...) pr_info("BTRFS: selftest: " fmt, ##__VA_ARGS__)
 
 struct btrfs_root;
 struct btrfs_trans_handle;
 
-int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize);
 int btrfs_test_extent_buffer_operations(u32 sectorsize, u32 nodesize);
+int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize);
 int btrfs_test_extent_io(u32 sectorsize, u32 nodesize);
 int btrfs_test_inodes(u32 sectorsize, u32 nodesize);
 int btrfs_test_qgroups(u32 sectorsize, u32 nodesize);
 int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize);
-int btrfs_init_test_fs(void);
-void btrfs_destroy_test_fs(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);
@@ -42,35 +41,7 @@ btrfs_alloc_dummy_block_group(unsigned long length, u32 sectorsize);
 void btrfs_free_dummy_block_group(struct btrfs_block_group_cache *cache);
 void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans);
 #else
-static inline int btrfs_test_free_space_cache(u32 sectorsize, u32 nodesize)
-{
-       return 0;
-}
-static inline int btrfs_test_extent_buffer_operations(u32 sectorsize,
-       u32 nodesize)
-{
-       return 0;
-}
-static inline int btrfs_init_test_fs(void)
-{
-       return 0;
-}
-static inline void btrfs_destroy_test_fs(void)
-{
-}
-static inline int btrfs_test_extent_io(u32 sectorsize, u32 nodesize)
-{
-       return 0;
-}
-static inline int btrfs_test_inodes(u32 sectorsize, u32 nodesize)
-{
-       return 0;
-}
-static inline int btrfs_test_qgroups(u32 sectorsize, u32 nodesize)
-{
-       return 0;
-}
-static inline int btrfs_test_free_space_tree(u32 sectorsize, u32 nodesize)
+static inline int btrfs_run_sanity_tests(void)
 {
        return 0;
 }