diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-18 12:31:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-18 12:31:42 -0500 |
| commit | 115090ef59ba6a371bed40181af8ceecc5635777 (patch) | |
| tree | 4bd3d9c53a16adcbb4f1498f0f0ed0fa011a5ef0 /fs/btrfs/disk-io.c | |
| parent | 4e81f3be340072ad2c0aac093677333702f14f22 (diff) | |
| parent | 1041eae4203cac442e4750a22c1f0007e2b9f628 (diff) | |
Merge branch '2022-01-17-assorted-updates'
- musb gadget pinctrl-single, pxa3xx nand bugfixes
- btrfs BLAKE2 hash support and another btrfs fix
- board_r cleanups
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index eb7736d53e..8043abc1bd 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -126,6 +126,8 @@ int btrfs_csum_data(u16 csum_type, const u8 *data, u8 *out, size_t len) return hash_xxhash(data, len, out); case BTRFS_CSUM_TYPE_SHA256: return hash_sha256(data, len, out); + case BTRFS_CSUM_TYPE_BLAKE2: + return hash_blake2(data, len, out); default: printf("Unknown csum type %d\n", csum_type); return -EINVAL; |