btrfs: add sha256 to checksumming algorithm

Add sha256 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 6d5a01c57da30f52ee44c6e16130b659498e37f2..75b6d10c984560c437a91ebed744b9f3d5510c4b 100644 (file)
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -6,6 +6,7 @@ config BTRFS_FS
        select CRYPTO_CRC32C
        select LIBCRC32C
        select CRYPTO_XXHASH
+       select CRYPTO_SHA256
        select ZLIB_INFLATE
        select ZLIB_DEFLATE
        select LZO_COMPRESS

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 7463c121791d1edca1880da48d2f7a2656d9ed22..bd6ea433ed6570653cd5f19cc370428410e1127c 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -35,6 +35,7 @@ static const struct btrfs_csums {
 } 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" },
 };
 
 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 82a2fa755b13d9ecea7ce630d2ce4747edde1fdc..21fab336f8ca109cfeedb9018eea5abd537265cf 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -353,6 +353,7 @@ static bool btrfs_supported_super_csum(u16 csum_type)
        switch (csum_type) {
        case BTRFS_CSUM_TYPE_CRC32:
        case BTRFS_CSUM_TYPE_XXHASH:
+       case BTRFS_CSUM_TYPE_SHA256:
                return true;
        default:
                return false;

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

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