From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 1/4] btrfs: Rename btrfs_check_super_valid() to btrfs_validate_super()
Date: Tue, 24 Apr 2018 12:48:06 +0800 [thread overview]
Message-ID: <20180424044809.29838-2-wqu@suse.com> (raw)
In-Reply-To: <20180424044809.29838-1-wqu@suse.com>
Makes the function name a little shorter and easier to read.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/disk-io.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 60caa68c3618..23b5c90cdbb2 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -55,7 +55,7 @@
static const struct extent_io_ops btree_extent_io_ops;
static void end_workqueue_fn(struct btrfs_work *work);
static void free_fs_root(struct btrfs_root *root);
-static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info);
+static int btrfs_validate_super(struct btrfs_fs_info *fs_info);
static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
struct btrfs_fs_info *fs_info);
@@ -2668,7 +2668,7 @@ int open_ctree(struct super_block *sb,
memcpy(fs_info->fsid, fs_info->super_copy->fsid, BTRFS_FSID_SIZE);
- ret = btrfs_check_super_valid(fs_info);
+ ret = btrfs_validate_super(fs_info);
if (ret) {
btrfs_err(fs_info, "superblock contains fatal errors");
err = -EINVAL;
@@ -3974,7 +3974,7 @@ int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid, int level,
level, first_key);
}
-static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info)
+static int btrfs_validate_super(struct btrfs_fs_info *fs_info)
{
struct btrfs_super_block *sb = fs_info->super_copy;
u64 nodesize = btrfs_super_nodesize(sb);
--
2.17.0
next prev parent reply other threads:[~2018-04-24 4:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 4:48 [PATCH v2 0/4] btrfs: Add write time super block validation Qu Wenruo
2018-04-24 4:48 ` Qu Wenruo [this message]
2018-04-24 4:48 ` [PATCH v2 2/4] btrfs: Add incompat flags check for btrfs_check_super_valid() Qu Wenruo
2018-04-24 10:48 ` David Sterba
2018-04-24 11:28 ` Qu Wenruo
2018-04-24 11:30 ` David Sterba
2018-04-24 12:03 ` Qu Wenruo
2018-04-24 4:48 ` [PATCH v2 3/4] btrfs: Add csum type " Qu Wenruo
2018-04-24 4:48 ` [PATCH v2 4/4] btrfs: Do super block verification before writing it to disk Qu Wenruo
2018-04-24 13:14 ` David Sterba
2018-05-10 14:43 ` [PATCH v2 0/4] btrfs: Add write time super block validation David Sterba
2018-05-11 2:57 ` Qu Wenruo
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=20180424044809.29838-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/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