From 1432ccc5bbcb51ef55f83ec386825840e87e8987 Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Mon, 23 Nov 2009 14:29:12 +0100
Subject: [PATCH] --- yaml --- r: 186439 b: refs/heads/master c:
 ddfd1f04b7bc557c1fe9b110e99cebb2e19d4993 h: refs/heads/master i:   186437:
 fddbe5df1bd4e12de6acbcd1faab803d784d9c00   186435:
 51fc59608f823ab32e39305acd19a13546d73d44   186431:
 4d345f0553b2cea83d1ee27ce5f33b8c98d62879 v: v3

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

diff --git a/[refs] b/[refs]
index 99adfc784bf7..2488eab56a13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6ada3de49074a913fb72f163657158be2c0e98
+refs/heads/master: ddfd1f04b7bc557c1fe9b110e99cebb2e19d4993
diff --git a/trunk/fs/logfs/dir.c b/trunk/fs/logfs/dir.c
index 89104e6f81c4..e7659b15a907 100644
--- a/trunk/fs/logfs/dir.c
+++ b/trunk/fs/logfs/dir.c
@@ -224,10 +224,14 @@ static int logfs_unlink(struct inode *dir, struct dentry *dentry)
 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
 
 	page = logfs_get_dd_page(dir, dentry);
-	if (!page)
+	if (!page) {
+		kfree(ta);
 		return -ENOENT;
-	if (IS_ERR(page))
+	}
+	if (IS_ERR(page)) {
+		kfree(ta);
 		return PTR_ERR(page);
+	}
 	index = page->index;
 	page_cache_release(page);