Btrfs: stop using highmem for extent_buffers

The extent_buffers have a very complex interface where
we use HIGHMEM for metadata and try to cache a kmap mapping
to access the memory.

The next commit adds reader/writer locks, and concurrent use
of this kmap cache would make it even more complex.

This commit drops the ability to use HIGHMEM with extent buffers,
and rips out all of the related code.

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

1 files changed, 2 insertions, 30 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 90d4ee52cd4..bb22a4435b2 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -664,10 +664,6 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
         struct btrfs_sector_sum *sector_sum;
         u32 nritems;
         u32 ins_size;
-        char *eb_map;
-        char *eb_token;
-        unsigned long map_len;
-        unsigned long map_start;
         u16 csum_size =
                 btrfs_super_csum_size(&root->fs_info->super_copy);
 
@@ -814,30 +810,9 @@ found:
         item_end = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_csum_item);
         item_end = (struct btrfs_csum_item *)((unsigned char *)item_end +
                                       btrfs_item_size_nr(leaf, path->slots[0]));
-        eb_token = NULL;
 next_sector:
 
-        if (!eb_token ||
-           (unsigned long)item + csum_size >= map_start + map_len) {
-                int err;
-
-                if (eb_token)
-                        unmap_extent_buffer(leaf, eb_token, KM_USER1);
-                eb_token = NULL;
-                err = map_private_extent_buffer(leaf, (unsigned long)item,
-                                                csum_size,
-                                                &eb_token, &eb_map,
-                                                &map_start, &map_len, KM_USER1);
-                if (err)
-                        eb_token = NULL;
-        }
-        if (eb_token) {
-                memcpy(eb_token + ((unsigned long)item & (PAGE_CACHE_SIZE - 1)),
-                       &sector_sum->sum, csum_size);
-        } else {
-                write_extent_buffer(leaf, &sector_sum->sum,
-                                    (unsigned long)item, csum_size);
-        }
+        write_extent_buffer(leaf, &sector_sum->sum, (unsigned long)item, csum_size);
 
         total_bytes += root->sectorsize;
         sector_sum++;
@@ -850,10 +825,7 @@ next_sector:
                         goto next_sector;
                 }
         }
-        if (eb_token) {
-                unmap_extent_buffer(leaf, eb_token, KM_USER1);
-                eb_token = NULL;
-        }
+
         btrfs_mark_buffer_dirty(path->nodes[0]);
         if (total_bytes < sums->len) {
                 btrfs_release_path(path);