squashfs: remove the second argument of k[un]map_atomic()
authorCong Wang <amwang@redhat.com>
Fri, 25 Nov 2011 15:14:36 +0000 (23:14 +0800)
committerCong Wang <xiyou.wangcong@gmail.com>
Tue, 20 Mar 2012 13:48:25 +0000 (21:48 +0800)
Signed-off-by: Cong Wang <amwang@redhat.com>
fs/squashfs/file.c
fs/squashfs/symlink.c

index 38bb1c6405590fa92addaa44a88b3f411575a9a3..8ca62c28fe1249fd40d7b8e01612b1dedc5ca704 100644 (file)
@@ -464,10 +464,10 @@ static int squashfs_readpage(struct file *file, struct page *page)
                if (PageUptodate(push_page))
                        goto skip_page;
 
-               pageaddr = kmap_atomic(push_page, KM_USER0);
+               pageaddr = kmap_atomic(push_page);
                squashfs_copy_data(pageaddr, buffer, offset, avail);
                memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail);
-               kunmap_atomic(pageaddr, KM_USER0);
+               kunmap_atomic(pageaddr);
                flush_dcache_page(push_page);
                SetPageUptodate(push_page);
 skip_page:
@@ -484,9 +484,9 @@ skip_page:
 error_out:
        SetPageError(page);
 out:
-       pageaddr = kmap_atomic(page, KM_USER0);
+       pageaddr = kmap_atomic(page);
        memset(pageaddr, 0, PAGE_CACHE_SIZE);
-       kunmap_atomic(pageaddr, KM_USER0);
+       kunmap_atomic(pageaddr);
        flush_dcache_page(page);
        if (!PageError(page))
                SetPageUptodate(page);
index 1191817264cc22dc1b07b6d5ca14aee99668e33c..12806dffb3454ed1a898bbdd7b2ca272d071694f 100644 (file)
@@ -90,14 +90,14 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page)
                        goto error_out;
                }
 
-               pageaddr = kmap_atomic(page, KM_USER0);
+               pageaddr = kmap_atomic(page);
                copied = squashfs_copy_data(pageaddr + bytes, entry, offset,
                                                                length - bytes);
                if (copied == length - bytes)
                        memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length);
                else
                        block = entry->next_index;
-               kunmap_atomic(pageaddr, KM_USER0);
+               kunmap_atomic(pageaddr);
                squashfs_cache_put(entry);
        }