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

---
 [refs]               | 2 +-
 trunk/fs/minix/dir.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c0b0c2bcfbd..f5b77c309671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50bc9b65b6e32f146c3c9812a9d62fe7ff518b5a
+refs/heads/master: 27a6d5c742ceff68b09396bb99cd6344afa85330
diff --git a/trunk/fs/minix/dir.c b/trunk/fs/minix/dir.c
index 085a9262c692..685b2d981b87 100644
--- a/trunk/fs/minix/dir.c
+++ b/trunk/fs/minix/dir.c
@@ -335,7 +335,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)
 		goto fail;
 	}
 
-	kaddr = kmap_atomic(page, KM_USER0);
+	kaddr = kmap_atomic(page);
 	memset(kaddr, 0, PAGE_CACHE_SIZE);
 
 	if (sbi->s_version == MINIX_V3) {
@@ -355,7 +355,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)
 		de->inode = dir->i_ino;
 		strcpy(de->name, "..");
 	}
-	kunmap_atomic(kaddr, KM_USER0);
+	kunmap_atomic(kaddr);
 
 	err = dir_commit_chunk(page, 0, 2 * sbi->s_dirsize);
 fail: