From: Jeff Mahoney <jeffm@suse.com>
To: Qu Wenruo <quwenruo@cn.fujitsu.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 04/31] btrfs: tests, move initialization into tests/
Date: Sun, 26 Jun 2016 22:28:14 -0400 [thread overview]
Message-ID: <57708F3E.7090205@suse.com> (raw)
In-Reply-To: <ad05794a-c417-ec49-d1b9-22eda06e141e@cn.fujitsu.com>
[-- Attachment #1.1: Type: text/plain, Size: 5803 bytes --]
On 6/26/16 10:17 PM, Qu Wenruo wrote:
>
>
> At 06/25/2016 06:14 AM, jeffm@suse.com wrote:
>> From: Jeff Mahoney <jeffm@suse.com>
>>
>> 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>
>> ---
>> fs/btrfs/super.c | 43
>> ----------------------------------------
>> fs/btrfs/tests/btrfs-tests.c | 47
>> ++++++++++++++++++++++++++++++++++++++++++--
>> fs/btrfs/tests/btrfs-tests.h | 35 +++------------------------------
>> 3 files changed, 48 insertions(+), 77 deletions(-)
>>
>> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
>> index a7b9a15..d8e48bb 100644
>> --- a/fs/btrfs/super.c
>> +++ b/fs/btrfs/super.c
>> @@ -2323,49 +2323,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 10eb249..d90c951 100644
>> --- 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 66fb6b70..e7d364f 100644
>> --- 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);
>
> Anything special for the line move?
> Otherwise it looks good for me.
No. It's probably leftover from an earlier revision. It's not necessary.
-Jeff
--
Jeff Mahoney
SUSE Labs
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 827 bytes --]
next prev parent reply other threads:[~2016-06-27 2:28 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 22:14 [PATCH 00/31] btrfs: simplify use of struct btrfs_root pointers jeffm
2016-06-24 22:14 ` [PATCH 01/31] btrfs: plumb fs_info into btrfs_work jeffm
2016-06-24 22:14 ` [PATCH 02/31] btrfs: prefix fsid to all trace events jeffm
2016-06-27 1:50 ` Qu Wenruo
2016-06-24 22:14 ` [PATCH 03/31] btrfs: btrfs_test_opt and friends should take a btrfs_fs_info jeffm
2016-06-27 2:14 ` Qu Wenruo
2016-06-27 2:21 ` Jeff Mahoney
2016-06-27 2:24 ` Qu Wenruo
2016-06-24 22:14 ` [PATCH 04/31] btrfs: tests, move initialization into tests/ jeffm
2016-06-27 2:17 ` Qu Wenruo
2016-06-27 2:28 ` Jeff Mahoney [this message]
2016-06-24 22:14 ` [PATCH 05/31] btrfs: tests, require fs_info for root jeffm
2016-07-08 1:32 ` Jeff Mahoney
2016-07-08 11:20 ` David Sterba
2016-06-24 22:14 ` [PATCH 06/31] btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root jeffm
2016-06-24 22:15 ` [PATCH 07/31] btrfs: simpilify btrfs_subvol_inherit_props jeffm
2016-06-24 22:15 ` [PATCH 08/31] btrfs: copy_to_sk drop unused root parameter jeffm
2016-06-24 22:15 ` [PATCH 09/31] btrfs: cleanup, remove prototype for btrfs_find_root_ref jeffm
2016-06-24 22:15 ` [PATCH 10/31] btrfs: introduce BTRFS_MAX_ITEM_SIZE jeffm
2016-06-24 22:15 ` [PATCH 11/31] btrfs: convert nodesize macros to static inlines jeffm
2016-06-24 22:15 ` [PATCH 12/31] btrfs: btrfs_relocate_chunk pass extent_root to btrfs_end_transaction jeffm
2016-06-24 22:15 ` [PATCH 13/31] btrfs: add btrfs_trans_handle->fs_info pointer jeffm
2016-06-24 22:15 ` [PATCH 14/31] btrfs: btrfs_abort_transaction, drop root parameter jeffm
2016-06-24 22:15 ` [PATCH 15/31] btrfs: call functions that overwrite their root parameter with fs_info jeffm
2016-09-06 17:40 ` David Sterba
2016-06-24 22:15 ` [PATCH 16/31] btrfs: call functions that always use the same root with fs_info instead jeffm
2016-06-24 22:15 ` [PATCH 17/31] btrfs: btrfs_init_new_device should use fs_info->dev_root jeffm
2016-06-24 22:15 ` [PATCH 18/31] btrfs: alloc_reserved_file_extent trace point should use extent_root jeffm
2016-06-24 22:15 ` [PATCH 19/31] btrfs: struct btrfsic_state->root should be an fs_info jeffm
2016-06-24 22:15 ` [PATCH 20/31] btrfs: struct reada_control.root -> reada_control.fs_info jeffm
2016-06-24 22:15 ` [PATCH 21/31] btrfs: root->fs_info cleanup, use fs_info->dev_root everywhere jeffm
2016-06-24 22:15 ` [PATCH 22/31] btrfs: root->fs_info cleanup, io_ctl_init jeffm
2016-06-24 22:15 ` [PATCH 24/31] btrfs: root->fs_info cleanup, btrfs_calc_{trans,trunc}_metadata_size jeffm
2016-06-24 22:15 ` [PATCH 25/31] btrfs: root->fs_info cleanup, lock/unlock_chunks jeffm
2016-06-24 22:15 ` [PATCH 26/31] btrfs: root->fs_info cleanup, update_block_group{,flags} jeffm
2016-06-24 22:15 ` [PATCH 28/31] btrfs: root->fs_info cleanup, access fs_info->delayed_root directly jeffm
2016-06-24 22:15 ` [PATCH 30/31] btrfs: root->fs_info cleanup, btrfs_commit_transaction already has root jeffm
2016-06-24 22:15 ` [PATCH 31/31] btrfs: root->fs_info cleanup, btrfs_end_transaction{,_throttle} use trans->fs_info instead of parameter jeffm
2016-06-26 13:50 ` [PATCH 00/31] btrfs: simplify use of struct btrfs_root pointers Jeff Mahoney
2016-06-27 1:34 ` Qu Wenruo
2016-07-07 14:07 ` David Sterba
2016-07-08 1:48 ` Jeff Mahoney
2016-07-08 2:19 ` Jeff Mahoney
2016-07-08 12:50 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57708F3E.7090205@suse.com \
--to=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).