diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-25 23:14:36 +0800 |
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 21:48:25 +0800 |
| commit | 53b55e55893fbce8d78caeb22e17a28d909a2132 (patch) | |
| tree | e884fec0becc6816a768bed778b857644104dc0d /fs/squashfs | |
| parent | 883da600b00eb6fa9f8db5687759732b3c6dd357 (diff) | |
| download | kernel_goldelico_gta04-53b55e55893fbce8d78caeb22e17a28d909a2132.zip kernel_goldelico_gta04-53b55e55893fbce8d78caeb22e17a28d909a2132.tar.gz kernel_goldelico_gta04-53b55e55893fbce8d78caeb22e17a28d909a2132.tar.bz2 | |
squashfs: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/file.c | 8 | ||||
| -rw-r--r-- | fs/squashfs/symlink.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c index 38bb1c6..8ca62c2 100644 --- a/fs/squashfs/file.c +++ b/fs/squashfs/file.c @@ -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); diff --git a/fs/squashfs/symlink.c b/fs/squashfs/symlink.c index 1191817..12806df 100644 --- a/fs/squashfs/symlink.c +++ b/fs/squashfs/symlink.c @@ -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); } |