Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[~shefty/rdma-dev.git] / fs / btrfs / extent_io.c
index 0c3ec003f273a1b9c1ec55008f5f86d795a9de86..8d904dd7ea9f6175012d8abdcf810a7d8d200ae7 100644 (file)
@@ -2608,10 +2608,10 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
 
                if (zero_offset) {
                        iosize = PAGE_CACHE_SIZE - zero_offset;
-                       userpage = kmap_atomic(page, KM_USER0);
+                       userpage = kmap_atomic(page);
                        memset(userpage + zero_offset, 0, iosize);
                        flush_dcache_page(page);
-                       kunmap_atomic(userpage, KM_USER0);
+                       kunmap_atomic(userpage);
                }
        }
        while (cur <= end) {
@@ -2620,10 +2620,10 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
                        struct extent_state *cached = NULL;
 
                        iosize = PAGE_CACHE_SIZE - pg_offset;
-                       userpage = kmap_atomic(page, KM_USER0);
+                       userpage = kmap_atomic(page);
                        memset(userpage + pg_offset, 0, iosize);
                        flush_dcache_page(page);
-                       kunmap_atomic(userpage, KM_USER0);
+                       kunmap_atomic(userpage);
                        set_extent_uptodate(tree, cur, cur + iosize - 1,
                                            &cached, GFP_NOFS);
                        unlock_extent_cached(tree, cur, cur + iosize - 1,
@@ -2669,10 +2669,10 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
                        char *userpage;
                        struct extent_state *cached = NULL;
 
-                       userpage = kmap_atomic(page, KM_USER0);
+                       userpage = kmap_atomic(page);
                        memset(userpage + pg_offset, 0, iosize);
                        flush_dcache_page(page);
-                       kunmap_atomic(userpage, KM_USER0);
+                       kunmap_atomic(userpage);
 
                        set_extent_uptodate(tree, cur, cur + iosize - 1,
                                            &cached, GFP_NOFS);
@@ -2819,10 +2819,10 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
        if (page->index == end_index) {
                char *userpage;
 
-               userpage = kmap_atomic(page, KM_USER0);
+               userpage = kmap_atomic(page);
                memset(userpage + pg_offset, 0,
                       PAGE_CACHE_SIZE - pg_offset);
-               kunmap_atomic(userpage, KM_USER0);
+               kunmap_atomic(userpage);
                flush_dcache_page(page);
        }
        pg_offset = 0;