[PATCH 2/3] btrfs: return required error from btrfs_check_super_csum

[Anand Jain]

Return the required -EINVAL from the function btrfs_check_super_csum()
and move the error logging into the btrfs_check_super_csum() itself.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
 fs/btrfs/disk-io.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 582ed6af3c50..aafd836af61d 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -406,7 +406,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info 
*fs_info,
        if (csum_type != BTRFS_CSUM_TYPE_CRC32) {
                btrfs_err(fs_info, "unsupported checksum algorithm %u",
                          csum_type);
-               return 1;
+               return -EINVAL;
        }
 
        /*
@@ -418,8 +418,10 @@ static int btrfs_check_super_csum(struct btrfs_fs_info 
*fs_info,
                              crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
        btrfs_csum_final(crc, result);
 
-       if (memcmp(raw_disk_sb, result, sizeof(result)))
-               return 1;
+       if (memcmp(raw_disk_sb, result, sizeof(result))) {
+               btrfs_err(fs_info, "superblock checksum mismatch");
+               return -EINVAL;
+       }
 
        return 0;
 }
@@ -2571,9 +2573,8 @@ int open_ctree(struct super_block *sb,
         * We want to check superblock checksum, the type is stored inside.
         * Pass the whole disk block of size BTRFS_SUPER_INFO_SIZE (4k).
         */
-       if (btrfs_check_super_csum(fs_info, bh->b_data)) {
-               btrfs_err(fs_info, "superblock checksum mismatch");
-               err = -EINVAL;
+       err = btrfs_check_super_csum(fs_info, bh->b_data);
+       if (err) {
                brelse(bh);
                goto fail_alloc;
        }
-- 
2.15.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