RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-03-05 18:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Cleanup check_tree_block() function

Browse Source 
Before this patch, check_tree_block() will print error on bytenr
mismatch but don't output error on fsid mismatch.

This patch will modify check_tree_block(), so it will only return errno
but not print error messages.
The error message will be output by print_tree_block_err() function.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
[renamed and cleaned return codes]
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Qu Wenruo 2015-01-29 16:32:39 +08:00 committed by David Sterba
parent 478a4f21e4
commit 56e69234e4
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
disk-io.c
View File

@ -22,6 +22,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <uuid/uuid.h>
#include "kerncompat.h"
#include "radix-tree.h"
#include "ctree.h"
@ -33,17 +34,18 @@
#include "print-tree.h"
#include "rbtree-utils.h"
/* specified errno for check_tree_block */
#define BTRFS_BAD_BYTENR (-1)
#define BTRFS_BAD_FSID (-2)
static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
{
struct btrfs_fs_devices *fs_devices;
int ret = 1;
int ret = BTRFS_BAD_FSID;
if (buf->start != btrfs_header_bytenr(buf)) {
printk("Check tree block failed, want=%Lu, have=%Lu\n",
buf->start, btrfs_header_bytenr(buf));
return ret;
}
if (buf->start != btrfs_header_bytenr(buf))
return BTRFS_BAD_BYTENR;
fs_devices = root->fs_info->fs_devices;
while (fs_devices) {
@ -58,6 +60,30 @@ static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
return ret;
}
static void print_tree_block_err(struct btrfs_root *root,
struct extent_buffer *eb,
int err)
{
char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = {'\0'};
char found_uuid[BTRFS_UUID_UNPARSED_SIZE] = {'\0'};
u8 buf[BTRFS_UUID_SIZE];
switch (err) {
case BTRFS_BAD_FSID:
read_extent_buffer(eb, buf, btrfs_header_fsid(),
BTRFS_UUID_SIZE);
uuid_unparse(buf, found_uuid);
uuid_unparse(root->fs_info->fsid, fs_uuid);
fprintf(stderr, "fsid mismatch, want=%s, have=%s\n",
fs_uuid, found_uuid);
break;
case BTRFS_BAD_BYTENR:
fprintf(stderr, "bytenr mismatch, want=%llu, have=%llu\n",
eb->start, btrfs_header_bytenr(eb));
break;
}
}
u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len)
{
return crc32c(seed, data, len);
@ -280,7 +306,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
}
if (ignore) {
if (check_tree_block(root, eb))
printk("read block failed check_tree_block\n");
print_tree_block_err(root, eb,
check_tree_block(root, eb));
else
printk("Csum didn't match\n");
ret = -EIO;
@ -343,8 +370,10 @@ static int write_tree_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct extent_buffer *eb)
{
if (check_tree_block(root, eb))
if (check_tree_block(root, eb)) {
print_tree_block_err(root, eb, check_tree_block(root, eb));
BUG();
}
if (!btrfs_buffer_uptodate(eb, trans->transid))
BUG();