From 635e42efe34f29e1c551478ed0fb6f3821a00297 Mon Sep 17 00:00:00 2001
From: Eric <sandeen@redhat.com>
Date: Mon, 16 Jul 2007 16:23:19 +0000
Subject: [PATCH] --- yaml --- r: 61499 b: refs/heads/master c:
 6fa20d4fb58cb342638bc14658083aadcad8fb74 h: refs/heads/master i:   61497:
 20a13db54a1490f40e16101269d74435f493d238   61495:
 e4771a648e01599f84b9fd65fd49e78a8f9d4b08 v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/inode.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8da90473e800..4845e85fca94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8803863a9051582081fb2bcca3a6dc8fddaed93c
+refs/heads/master: 6fa20d4fb58cb342638bc14658083aadcad8fb74
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index cfa5b360d12e..9ae901e54412 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -1353,10 +1353,7 @@ static int cifs_truncate_page(struct address_space *mapping, loff_t from)
 	if (!page)
 		return -ENOMEM;
 
-	kaddr = kmap_atomic(page, KM_USER0);
-	memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
-	flush_dcache_page(page);
-	kunmap_atomic(kaddr, KM_USER0);
+	zero_user_page(page, offset, PAGE_CACHE_SIZE - offset), KM_USER0);
 	unlock_page(page);
 	page_cache_release(page);
 	return rc;