btrfs: add xxhash64 to checksumming algorithms

Add xxhash64 to the list of possible checksumming algorithms used by
BTRFS.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index 38651fae7f21aef15fd40f187d915144c9d3f952..6d5a01c57da30f52ee44c6e16130b659498e37f2 100644 (file)
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -5,6 +5,7 @@ config BTRFS_FS
        select CRYPTO
        select CRYPTO_CRC32C
        select LIBCRC32C
+       select CRYPTO_XXHASH
        select ZLIB_INFLATE
        select ZLIB_DEFLATE
        select LZO_COMPRESS

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 7397579786863c1e4b4fdd0ffe9b374705f14108..7463c121791d1edca1880da48d2f7a2656d9ed22 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -34,6 +34,7 @@ static const struct btrfs_csums {
        const char      *name;
 } btrfs_csums[] = {
        [BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },
+       [BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },
 };
 
 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 5d32deb429936cdb9e65481a612e514137546b38..82a2fa755b13d9ecea7ce630d2ce4747edde1fdc 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -352,6 +352,7 @@ static bool btrfs_supported_super_csum(u16 csum_type)
 {
        switch (csum_type) {
        case BTRFS_CSUM_TYPE_CRC32:
+       case BTRFS_CSUM_TYPE_XXHASH:
                return true;
        default:
                return false;

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index d5d15a19f51d86b5fc2bd1086d305fba53a30b00..c91cdf123cd86b92348d15b0f91276ffc8208fa7 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2462,3 +2462,4 @@ module_exit(exit_btrfs_fs)
 
 MODULE_LICENSE("GPL");
 MODULE_SOFTDEP("pre: crc32c");
+MODULE_SOFTDEP("pre: xxhash64");

diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
index 44136de2f5d7986e205fb52c9d73dd4887bfaa39..962312939a8f1599e620759a3a05c505840e4ce8 100644 (file)
--- a/include/uapi/linux/btrfs_tree.h
+++ b/include/uapi/linux/btrfs_tree.h
@@ -302,6 +302,7 @@
 /* csum types */
 enum btrfs_csum_type {
        BTRFS_CSUM_TYPE_CRC32   = 0,
+       BTRFS_CSUM_TYPE_XXHASH  = 1,
 };
 
 /*