From 0325e3ff12b4947302df24402b13038600e50642 Mon Sep 17 00:00:00 2001
From: Cong Wang <amwang@redhat.com>
Date: Fri, 10 Feb 2012 13:39:50 +0800
Subject: [PATCH] --- yaml --- r: 287679 b: refs/heads/master c:
 465c9343c5b746ec2325a220fa3e50cc647d2db7 h: refs/heads/master i:   287677:
 a8afe67d29fdf4924493730c70a320639928e5a1   287675:
 b27a7c4084164f8e97f173d5a5716c6564c306b3   287671:
 1b548ecb36a047872603ee589b6fb29cafa5e65c   287663:
 c6276c108f7aa581bd8ac39fe1581aa9d8f4ce00   287647:
 aa22db5e515bfd9c93b22fe0d89dd2f85d6cc977   287615:
 98f07afcaf1e6c3144ca2c7c43450a2405afea39 v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ecryptfs/mmap.c       | 4 ++--
 trunk/fs/ecryptfs/read_write.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7b213d71d6f6..3fe0325f5890 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 545d680938be1e86a6c5250701ce9abaf360c495
+refs/heads/master: 465c9343c5b746ec2325a220fa3e50cc647d2db7
diff --git a/trunk/fs/ecryptfs/mmap.c b/trunk/fs/ecryptfs/mmap.c
index 10ec695ccd68..a46b3a8fee1e 100644
--- a/trunk/fs/ecryptfs/mmap.c
+++ b/trunk/fs/ecryptfs/mmap.c
@@ -150,7 +150,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
 			/* This is a header extent */
 			char *page_virt;
 
-			page_virt = kmap_atomic(page, KM_USER0);
+			page_virt = kmap_atomic(page);
 			memset(page_virt, 0, PAGE_CACHE_SIZE);
 			/* TODO: Support more than one header extent */
 			if (view_extent_num == 0) {
@@ -163,7 +163,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
 							       crypt_stat,
 							       &written);
 			}
-			kunmap_atomic(page_virt, KM_USER0);
+			kunmap_atomic(page_virt);
 			flush_dcache_page(page);
 			if (rc) {
 				printk(KERN_ERR "%s: Error reading xattr "
diff --git a/trunk/fs/ecryptfs/read_write.c b/trunk/fs/ecryptfs/read_write.c
index 5c0106f75775..b2a34a192f4f 100644
--- a/trunk/fs/ecryptfs/read_write.c
+++ b/trunk/fs/ecryptfs/read_write.c
@@ -156,7 +156,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
 			       ecryptfs_page_idx, rc);
 			goto out;
 		}
-		ecryptfs_page_virt = kmap_atomic(ecryptfs_page, KM_USER0);
+		ecryptfs_page_virt = kmap_atomic(ecryptfs_page);
 
 		/*
 		 * pos: where we're now writing, offset: where the request was
@@ -179,7 +179,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
 			       (data + data_offset), num_bytes);
 			data_offset += num_bytes;
 		}
-		kunmap_atomic(ecryptfs_page_virt, KM_USER0);
+		kunmap_atomic(ecryptfs_page_virt);
 		flush_dcache_page(ecryptfs_page);
 		SetPageUptodate(ecryptfs_page);
 		unlock_page(ecryptfs_page);