浏览代码

btrfs: move ifdef around sanity checks out of init_btrfs_fs

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
David Sterba 12 年之前
父节点
当前提交
e6d2960582
共有 3 个文件被更改,包括 3 次插入5 次删除
  1. 3 1
      fs/btrfs/free-space-cache.c
  2. 0 2
      fs/btrfs/free-space-cache.h
  3. 0 2
      fs/btrfs/super.c

+ 3 - 1
fs/btrfs/free-space-cache.c

@@ -3490,4 +3490,6 @@ out:
 	test_msg("Free space cache tests finished\n");
 	test_msg("Free space cache tests finished\n");
 }
 }
 #undef test_msg
 #undef test_msg
-#endif /* CONFIG_BTRFS_FS_RUN_SANITY_TESTS */
+#else /* !CONFIG_BTRFS_FS_RUN_SANITY_TESTS */
+void btrfs_test_free_space_cache(void) {}
+#endif /* !CONFIG_BTRFS_FS_RUN_SANITY_TESTS */

+ 0 - 2
fs/btrfs/free-space-cache.h

@@ -113,8 +113,6 @@ int btrfs_return_cluster_to_free_space(
 int btrfs_trim_block_group(struct btrfs_block_group_cache *block_group,
 int btrfs_trim_block_group(struct btrfs_block_group_cache *block_group,
 			   u64 *trimmed, u64 start, u64 end, u64 minlen);
 			   u64 *trimmed, u64 start, u64 end, u64 minlen);
 
 
-#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
 void btrfs_test_free_space_cache(void);
 void btrfs_test_free_space_cache(void);
-#endif
 
 
 #endif
 #endif

+ 0 - 2
fs/btrfs/super.c

@@ -1733,9 +1733,7 @@ static int __init init_btrfs_fs(void)
 
 
 	btrfs_init_lockdep();
 	btrfs_init_lockdep();
 
 
-#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
 	btrfs_test_free_space_cache();
 	btrfs_test_free_space_cache();
-#endif
 
 
 	printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
 	printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
 	return 0;
 	return 0;