btrfs: use btrfs_crc32c{,_final}() in for free space cache

[sfrench/cifs-2.6.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index f74dc259307b69af0660ac3080c39e103b21a948..6814fa42eba3ccf8a2f47cb1e6bc73591b75075a 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -465,9 +465,8 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index)
        if (index == 0)
                offset = sizeof(u32) * io_ctl->num_pages;
 
-       crc = btrfs_csum_data(io_ctl->orig + offset, crc,
-                             PAGE_SIZE - offset);
-       btrfs_csum_final(crc, (u8 *)&crc);
+       crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);
+       btrfs_crc32c_final(crc, (u8 *)&crc);
        io_ctl_unmap_page(io_ctl);
        tmp = page_address(io_ctl->pages[0]);
        tmp += index;
@@ -493,9 +492,8 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index)
        val = *tmp;
 
        io_ctl_map_page(io_ctl, 0);
-       crc = btrfs_csum_data(io_ctl->orig + offset, crc,
-                             PAGE_SIZE - offset);
-       btrfs_csum_final(crc, (u8 *)&crc);
+       crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);
+       btrfs_crc32c_final(crc, (u8 *)&crc);
        if (val != crc) {
                btrfs_err_rl(io_ctl->fs_info,
                        "csum mismatch on free space cache");
@@ -3166,8 +3164,8 @@ static int do_trimming(struct btrfs_block_group_cache *block_group,
                        space_info->bytes_readonly += reserved_bytes;
                block_group->reserved -= reserved_bytes;
                space_info->bytes_reserved -= reserved_bytes;
-               spin_unlock(&space_info->lock);
                spin_unlock(&block_group->lock);
+               spin_unlock(&space_info->lock);
        }
 
        return ret;
@@ -3358,7 +3356,7 @@ void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *block_group)
 
        if (cleanup) {
                mutex_lock(&fs_info->chunk_mutex);
-               em_tree = &fs_info->mapping_tree.map_tree;
+               em_tree = &fs_info->mapping_tree;
                write_lock(&em_tree->lock);
                em = lookup_extent_mapping(em_tree, block_group->key.objectid,
                                           1);