Introduce a new function, scrub_tree_mirror(), to scrub mirror based
tree blocks (Single/DUP/RAID0/1/10)
This function can also be used on in-memory tree blocks using @data
parameter.
This is very handy for RAID5/6 case, either checking the data stripe
tree block by @bytenr and 0 as @mirror, or using @data parameter for
recovered in-memory data.
Signed-off-by: Qu Wenruo <quwen...@cn.fujitsu.com>
---
disk-io.c | 4 ++--
disk-io.h | 2 ++
scrub.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/disk-io.c b/disk-io.c
index 9140a81b..d5011572 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -51,8 +51,8 @@ static u32 max_nritems(u8 level, u32 nodesize)
sizeof(struct btrfs_key_ptr));
}
-static int check_tree_block(struct btrfs_fs_info *fs_info,
- struct extent_buffer *buf)
+int check_tree_block(struct btrfs_fs_info *fs_info,
+ struct extent_buffer *buf)
{
struct btrfs_fs_devices *fs_devices;
diff --git a/disk-io.h b/disk-io.h
index 4de9fef7..db883d57 100644
--- a/disk-io.h
+++ b/disk-io.h
@@ -119,6 +119,8 @@ static inline struct extent_buffer* read_tree_block(
parent_transid);
}
+int check_tree_block(struct btrfs_fs_info *fs_info,
+ struct extent_buffer *buf);
int read_extent_data(struct btrfs_root *root, char *data, u64 logical,
u64 *len, int mirror);
void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
diff --git a/scrub.c b/scrub.c
index c9ca817e..4cf678fb 100644
--- a/scrub.c
+++ b/scrub.c
@@ -118,3 +118,75 @@ static struct scrub_full_stripe *alloc_full_stripe(int
nr_stripes,
}
return ret;
}
+
+static inline int is_data_stripe(struct scrub_stripe *stripe)
+{
+ u64 bytenr = stripe->logical;
+
+ if (bytenr == BTRFS_RAID5_P_STRIPE || bytenr == BTRFS_RAID6_Q_STRIPE)
+ return 0;
+ return 1;
+}
+
+/*
+ * Scrub one tree mirror given by @bytenr and @mirror, or @data.
+ * If @data is not given(NULL), the function will try to read out tree block
+ * using @bytenr and @mirror.
+ * If @data is given, use data directly, won't try to read from disk.
+ *
+ * The extra @data prameter is handy for RAID5/6 recovery code to verify
+ * the recovered data.
+ *
+ * Return 0 if everything is OK.
+ * Return <0 something goes wrong, and @scrub_ctx accounting will be updated
+ * if it's a data corruption.
+ */
+static int scrub_tree_mirror(struct btrfs_fs_info *fs_info,
+ struct btrfs_scrub_progress *scrub_ctx,
+ char *data, u64 bytenr, int mirror)
+{
+ struct extent_buffer *eb;
+ u32 nodesize = fs_info->tree_root->nodesize;
+ int ret;
+
+ if (!IS_ALIGNED(bytenr, fs_info->tree_root->sectorsize)) {
+ /* Such error will be reported by check_tree_block() */
+ scrub_ctx->verify_errors++;
+ return -EIO;
+ }
+
+ eb = btrfs_find_create_tree_block(fs_info, bytenr, nodesize);
+ if (!eb)
+ return -ENOMEM;
+ if (data) {
+ memcpy(eb->data, data, nodesize);
+ } else {
+ ret = read_whole_eb(fs_info, eb, mirror);
+ if (ret) {
+ scrub_ctx->read_errors++;
+ error("failed to read tree block %llu mirror %d",
+ bytenr, mirror);
+ goto out;
+ }
+ }
+
+ scrub_ctx->tree_bytes_scrubbed += nodesize;
+ if (csum_tree_block(fs_info->tree_root, eb, 1)) {
+ error("tree block %llu mirror %d checksum mismatch", bytenr,
+ mirror);
+ scrub_ctx->csum_errors++;
+ ret = -EIO;
+ goto out;
+ }
+ ret = check_tree_block(fs_info, eb);
+ if (ret < 0) {
+ error("tree block %llu mirror %d is invalid", bytenr, mirror);
+ scrub_ctx->verify_errors++;
+ goto out;
+ }
+
+ scrub_ctx->tree_extents_scrubbed++;
+out:
+ free_extent_buffer(eb);
+ return ret;
+}
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
