btrfs: add blake2b to checksumming algorithms

Add blake2b (with 256 bit digest) to the list of possible checksumming
algorithms used by BTRFS.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index c211216b4524eb3237a22c23bb790629d7f8ced9..5b6e86aaf2e1a42f468c0dbb94e8231d12973d1e 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -37,6 +37,8 @@ static const struct btrfs_csums {
        [BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },
        [BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },
        [BTRFS_CSUM_TYPE_SHA256] = { .size = 32, .name = "sha256" },
+       [BTRFS_CSUM_TYPE_BLAKE2] = { .size = 32, .name = "blake2b",
+                                    .driver = "blake2b-256" },
 };
 
 int btrfs_super_csum_size(const struct btrfs_super_block *s)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 948ed5ac0794fe70173fb9105538661f28b43788..7c345c4bc817f900429203f64713c3d7a8a648ec 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -354,6 +354,7 @@ static bool btrfs_supported_super_csum(u16 csum_type)
        case BTRFS_CSUM_TYPE_CRC32:
        case BTRFS_CSUM_TYPE_XXHASH:
        case BTRFS_CSUM_TYPE_SHA256:
+       case BTRFS_CSUM_TYPE_BLAKE2:
                return true;
        default:
                return false;

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 36440336c08bdb33ddcc48ad73e753d380d39450..792bb0bc9a0bc1fb7333f8451f15409199a1150b 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2464,3 +2464,4 @@ MODULE_LICENSE("GPL");
 MODULE_SOFTDEP("pre: crc32c");
 MODULE_SOFTDEP("pre: xxhash64");
 MODULE_SOFTDEP("pre: sha256");
+MODULE_SOFTDEP("pre: blake2b-256");

diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
index e2823c9b20613aff4a9d5d4509acb769cf25750c..5160be1d7332ca2c614f8ec7688d0eb952408f12 100644 (file)
--- a/include/uapi/linux/btrfs_tree.h
+++ b/include/uapi/linux/btrfs_tree.h
@@ -304,6 +304,7 @@ enum btrfs_csum_type {
        BTRFS_CSUM_TYPE_CRC32   = 0,
        BTRFS_CSUM_TYPE_XXHASH  = 1,
        BTRFS_CSUM_TYPE_SHA256  = 2,
+       BTRFS_CSUM_TYPE_BLAKE2  = 3,
 };
 
 /*