diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:36 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:25 -0400 |
commit | 53b55e55893fbce8d78caeb22e17a28d909a2132 (patch) | |
tree | e884fec0becc6816a768bed778b857644104dc0d /fs | |
parent | 883da600b00eb6fa9f8db5687759732b3c6dd357 (diff) |
squashfs: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'fs')
-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 38bb1c640559..8ca62c28fe12 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) | |||
464 | if (PageUptodate(push_page)) | 464 | if (PageUptodate(push_page)) |
465 | goto skip_page; | 465 | goto skip_page; |
466 | 466 | ||
467 | pageaddr = kmap_atomic(push_page, KM_USER0); | 467 | pageaddr = kmap_atomic(push_page); |
468 | squashfs_copy_data(pageaddr, buffer, offset, avail); | 468 | squashfs_copy_data(pageaddr, buffer, offset, avail); |
469 | memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); | 469 | memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); |
470 | kunmap_atomic(pageaddr, KM_USER0); | 470 | kunmap_atomic(pageaddr); |
471 | flush_dcache_page(push_page); | 471 | flush_dcache_page(push_page); |
472 | SetPageUptodate(push_page); | 472 | SetPageUptodate(push_page); |
473 | skip_page: | 473 | skip_page: |
@@ -484,9 +484,9 @@ skip_page: | |||
484 | error_out: | 484 | error_out: |
485 | SetPageError(page); | 485 | SetPageError(page); |
486 | out: | 486 | out: |
487 | pageaddr = kmap_atomic(page, KM_USER0); | 487 | pageaddr = kmap_atomic(page); |
488 | memset(pageaddr, 0, PAGE_CACHE_SIZE); | 488 | memset(pageaddr, 0, PAGE_CACHE_SIZE); |
489 | kunmap_atomic(pageaddr, KM_USER0); | 489 | kunmap_atomic(pageaddr); |
490 | flush_dcache_page(page); | 490 | flush_dcache_page(page); |
491 | if (!PageError(page)) | 491 | if (!PageError(page)) |
492 | SetPageUptodate(page); | 492 | SetPageUptodate(page); |
diff --git a/fs/squashfs/symlink.c b/fs/squashfs/symlink.c index 1191817264cc..12806dffb345 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) | |||
90 | goto error_out; | 90 | goto error_out; |
91 | } | 91 | } |
92 | 92 | ||
93 | pageaddr = kmap_atomic(page, KM_USER0); | 93 | pageaddr = kmap_atomic(page); |
94 | copied = squashfs_copy_data(pageaddr + bytes, entry, offset, | 94 | copied = squashfs_copy_data(pageaddr + bytes, entry, offset, |
95 | length - bytes); | 95 | length - bytes); |
96 | if (copied == length - bytes) | 96 | if (copied == length - bytes) |
97 | memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length); | 97 | memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length); |
98 | else | 98 | else |
99 | block = entry->next_index; | 99 | block = entry->next_index; |
100 | kunmap_atomic(pageaddr, KM_USER0); | 100 | kunmap_atomic(pageaddr); |
101 | squashfs_cache_put(entry); | 101 | squashfs_cache_put(entry); |
102 | } | 102 | } |
103 | 103 | ||