Btrfs: Switch to libcrc32c to avoid problems with cryptomgr on highmem machines

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 1e83ad7..19a1d99 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -286,10 +286,7 @@ struct btrfs_block_group_cache {
        int cached;
 };
 
-struct crypto_hash;
-
 struct btrfs_fs_info {
-       spinlock_t hash_lock;
        struct btrfs_root *extent_root;
        struct btrfs_root *tree_root;
        struct radix_tree_root fs_roots_radix;
@@ -314,7 +311,6 @@ struct btrfs_fs_info {
        struct mutex fs_mutex;
        struct list_head trans_list;
        struct list_head dead_roots;
-       struct crypto_hash *hash_tfm;
        struct delayed_work trans_work;
        int do_barriers;
        int closing;

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge