From bc3e5c92e60d3ab9ff47c67a67ff9ffa2fd13ebe Mon Sep 17 00:00:00 2001
From: Cong Wang <amwang@redhat.com>
Date: Fri, 25 Nov 2011 23:14:36 +0800
Subject: [PATCH] --- yaml --- r: 291820 b: refs/heads/master c:
 53b55e55893fbce8d78caeb22e17a28d909a2132 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/squashfs/file.c    | 8 ++++----
 trunk/fs/squashfs/symlink.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4fa3ebdf2c24..1430536f1625 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 883da600b00eb6fa9f8db5687759732b3c6dd357
+refs/heads/master: 53b55e55893fbce8d78caeb22e17a28d909a2132
diff --git a/trunk/fs/squashfs/file.c b/trunk/fs/squashfs/file.c
index 38bb1c640559..8ca62c28fe12 100644
--- a/trunk/fs/squashfs/file.c
+++ b/trunk/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 @@ static int squashfs_readpage(struct file *file, struct page *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/trunk/fs/squashfs/symlink.c b/trunk/fs/squashfs/symlink.c
index 1191817264cc..12806dffb345 100644
--- a/trunk/fs/squashfs/symlink.c
+++ b/trunk/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);
 	}