From 5a0db6332f4b81696fbeae8666cbb3b777d215b2 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 17 Jan 2008 15:21:09 -0800
Subject: [PATCH] --- yaml --- r: 75525 b: refs/heads/master c:
 46a39c1cd5d2f804b27e9a4be3fb1b510dda9570 h: refs/heads/master i:   75523:
 488ee495d8a57395352bd2969debcc9c7c26fc27 v: v3

---
 [refs]               | 2 +-
 trunk/fs/hfs/btree.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 27c2c66725c5..c26e9774b67c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6915719b36a97d28fab576c6fa2a20364b435fe6
+refs/heads/master: 46a39c1cd5d2f804b27e9a4be3fb1b510dda9570
diff --git a/trunk/fs/hfs/btree.c b/trunk/fs/hfs/btree.c
index 31284c77bba8..110dd3515dc8 100644
--- a/trunk/fs/hfs/btree.c
+++ b/trunk/fs/hfs/btree.c
@@ -61,7 +61,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	mapping = tree->inode->i_mapping;
 	page = read_mapping_page(mapping, 0, NULL);
 	if (IS_ERR(page))
-		goto free_tree;
+		goto free_inode;
 
 	/* Load the header */
 	head = (struct hfs_btree_header_rec *)(kmap(page) + sizeof(struct hfs_bnode_desc));
@@ -99,11 +99,12 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
 	page_cache_release(page);
 	return tree;
 
- fail_page:
+fail_page:
 	page_cache_release(page);
- free_tree:
+free_inode:
 	tree->inode->i_mapping->a_ops = &hfs_aops;
 	iput(tree->inode);
+free_tree:
 	kfree(tree);
 	return NULL;
 }