Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[mirror_ubuntu-hirsute-kernel.git] / fs / btrfs / extent_io.c

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 2fb52c26c677d22867cbe96e46e230813fe03053..c9018a05036e943a52ad91d81019bb4b934b6b9a 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2612,10 +2612,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) {
@@ -2624,10 +2624,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,
@@ -2673,10 +2673,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);
@@ -2823,10 +2823,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;