From 975df0d124080a42e6bbefd1db4c72b91074bf6d Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Wed, 9 Mar 2011 11:49:13 -0600
Subject: [PATCH] --- yaml --- r: 243189 b: refs/heads/master c:
 50f198ae16ac66508d4b8d5a40967a8507ad19ee h: refs/heads/master i:   243187:
 8ecd40dd1894427856220033e5130a40fa906069 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ecryptfs/mmap.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6134fbcaf777..0985e4a53f91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57db4e8d73ef2b5e94a3f412108dff2576670a8a
+refs/heads/master: 50f198ae16ac66508d4b8d5a40967a8507ad19ee
diff --git a/trunk/fs/ecryptfs/mmap.c b/trunk/fs/ecryptfs/mmap.c
index 5e150131eb9d..6a44148c5fb9 100644
--- a/trunk/fs/ecryptfs/mmap.c
+++ b/trunk/fs/ecryptfs/mmap.c
@@ -381,6 +381,11 @@ static int ecryptfs_write_begin(struct file *file,
 	    && (pos != 0))
 		zero_user(page, 0, PAGE_CACHE_SIZE);
 out:
+	if (unlikely(rc)) {
+		unlock_page(page);
+		page_cache_release(page);
+		*pagep = NULL;
+	}
 	return rc;
 }