From e58105df6086d1d13466981c9f28ecea9c08b749 Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Wed, 11 May 2016 15:40:38 +0200 Subject: [PATCH] btrfs-progs: replace printf with message helpers in check_super Signed-off-by: Liu Bo Signed-off-by: David Sterba --- disk-io.c | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/disk-io.c b/disk-io.c index 75daca8..86abdeb 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1395,14 +1395,13 @@ static int check_super(struct btrfs_super_block *sb) int csum_size; if (btrfs_super_magic(sb) != BTRFS_MAGIC) { - fprintf(stderr, "ERROR: superblock magic doesn't match\n"); + error("superblock magic doesn't match"); return -EIO; } csum_type = btrfs_super_csum_type(sb); if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) { - fprintf(stderr, "ERROR: unsupported checksum algorithm %u\n", - csum_type); + error("unsupported checksum algorithm %u\n", csum_type); return -EIO; } csum_size = btrfs_csum_sizes[csum_type]; @@ -1413,58 +1412,55 @@ static int check_super(struct btrfs_super_block *sb) btrfs_csum_final(crc, result); if (memcmp(result, sb->csum, csum_size)) { - fprintf(stderr, "ERROR: superblock checksum mismatch\n"); + error("superblock checksum mismatch"); return -EIO; } if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: tree_root level too big: %d >= %d\n", + error("tree_root level too big: %d >= %d", btrfs_super_root_level(sb), BTRFS_MAX_LEVEL); goto error_out; } if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: chunk_root level too big: %d >= %d\n", + error("chunk_root level too big: %d >= %d", btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL); goto error_out; } if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) { - fprintf(stderr, "ERROR: log_root level too big: %d >= %d\n", + error("log_root level too big: %d >= %d", btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL); goto error_out; } if (!IS_ALIGNED(btrfs_super_root(sb), 4096)) { - fprintf(stderr, "ERROR: tree_root block unaligned: %llu\n", - btrfs_super_root(sb)); + error("tree_root block unaligned: %llu", btrfs_super_root(sb)); goto error_out; } if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096)) { - fprintf(stderr, "ERROR: chunk_root block unaligned: %llu\n", + error("chunk_root block unaligned: %llu", btrfs_super_chunk_root(sb)); goto error_out; } if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096)) { - fprintf(stderr, "ERROR: log_root block unaligned: %llu\n", + error("log_root block unaligned: %llu", btrfs_super_log_root(sb)); goto error_out; } if (btrfs_super_nodesize(sb) < 4096) { - fprintf(stderr, "ERROR: nodesize too small: %u < 4096\n", + error("nodesize too small: %u < 4096", btrfs_super_nodesize(sb)); goto error_out; } if (!IS_ALIGNED(btrfs_super_nodesize(sb), 4096)) { - fprintf(stderr, "ERROR: nodesize unaligned: %u\n", - btrfs_super_nodesize(sb)); + error("nodesize unaligned: %u", btrfs_super_nodesize(sb)); goto error_out; } if (btrfs_super_sectorsize(sb) < 4096) { - fprintf(stderr, "ERROR: sectorsize too small: %u < 4096\n", + error("sectorsize too small: %u < 4096", btrfs_super_sectorsize(sb)); goto error_out; } if (!IS_ALIGNED(btrfs_super_sectorsize(sb), 4096)) { - fprintf(stderr, "ERROR: sectorsize unaligned: %u\n", - btrfs_super_sectorsize(sb)); + error("sectorsize unaligned: %u", btrfs_super_sectorsize(sb)); goto error_out; } if (btrfs_super_total_bytes(sb) == 0) { @@ -1486,8 +1482,7 @@ static int check_super(struct btrfs_super_block *sb) uuid_unparse(sb->fsid, fsid); uuid_unparse(sb->dev_item.fsid, dev_fsid); - printk(KERN_ERR - "ERROR: dev_item UUID does not match fsid: %s != %s\n", + error("dev_item UUID does not match fsid: %s != %s", dev_fsid, fsid); goto error_out; } @@ -1496,12 +1491,12 @@ static int check_super(struct btrfs_super_block *sb) * Hint to catch really bogus numbers, bitflips or so */ if (btrfs_super_num_devices(sb) > (1UL << 31)) { - fprintf(stderr, "WARNING: suspicious number of devices: %llu\n", + warning("suspicious number of devices: %llu", btrfs_super_num_devices(sb)); } if (btrfs_super_num_devices(sb) == 0) { - fprintf(stderr, "ERROR: number of devices is 0\n"); + error("number of devices is 0"); goto error_out; } @@ -1510,17 +1505,17 @@ static int check_super(struct btrfs_super_block *sb) * and one chunk */ if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) { - fprintf(stderr, "BTRFS: system chunk array too big %u > %u\n", - btrfs_super_sys_array_size(sb), - BTRFS_SYSTEM_CHUNK_ARRAY_SIZE); + error("system chunk array too big %u > %u", + btrfs_super_sys_array_size(sb), + BTRFS_SYSTEM_CHUNK_ARRAY_SIZE); goto error_out; } if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key) + sizeof(struct btrfs_chunk)) { - fprintf(stderr, "BTRFS: system chunk array too small %u < %lu\n", - btrfs_super_sys_array_size(sb), - sizeof(struct btrfs_disk_key) + - sizeof(struct btrfs_chunk)); + error("system chunk array too small %u < %lu", + btrfs_super_sys_array_size(sb), + sizeof(struct btrfs_disk_key) + + sizeof(struct btrfs_chunk)); goto error_out; } -- 2.7.4