From 2543dbcaf01b8ad916b8400480da4efd69f6c4e2 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Date: Mon, 13 May 2013 08:38:35 +0900
Subject: [PATCH] --- yaml --- r: 377656 b: refs/heads/master c:
 650495dedc34daf8590c708a5b48f82ed2787b75 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/f2fs/data.c | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index abbd8d3e6e38..911be9523360 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65e5cd0a151d53d3d79ef4d81783d1dbc01d4b61
+refs/heads/master: 650495dedc34daf8590c708a5b48f82ed2787b75
diff --git a/trunk/fs/f2fs/data.c b/trunk/fs/f2fs/data.c
index 91ff93b0b0f4..05fb5c6077b8 100644
--- a/trunk/fs/f2fs/data.c
+++ b/trunk/fs/f2fs/data.c
@@ -233,18 +233,23 @@ struct page *get_lock_data_page(struct inode *inode, pgoff_t index)
 	struct page *page;
 	int err;
 
+repeat:
+	page = grab_cache_page(mapping, index);
+	if (!page)
+		return ERR_PTR(-ENOMEM);
+
 	set_new_dnode(&dn, inode, NULL, NULL, 0);
 	err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
-	if (err)
+	if (err) {
+		f2fs_put_page(page, 1);
 		return ERR_PTR(err);
+	}
 	f2fs_put_dnode(&dn);
 
-	if (dn.data_blkaddr == NULL_ADDR)
+	if (dn.data_blkaddr == NULL_ADDR) {
+		f2fs_put_page(page, 1);
 		return ERR_PTR(-ENOENT);
-repeat:
-	page = grab_cache_page(mapping, index);
-	if (!page)
-		return ERR_PTR(-ENOMEM);
+	}
 
 	if (PageUptodate(page))
 		return page;