From 886a5a8e07a4c8e039e47a6ad72a14fad5fe23f7 Mon Sep 17 00:00:00 2001
From: Dave Anderson <anderson@redhat.com>
Date: Mon, 13 Apr 2009 14:39:46 -0700
Subject: [PATCH] --- yaml --- r: 143193 b: refs/heads/master c:
 eb2e5f452a1456c7a20f7566a24d5a8f6ef3edd5 h: refs/heads/master i:   143191:
 fc7a0c3850f3a31e68f4505bef0e0f7145e292fb v: v3

---
 [refs]               | 2 +-
 trunk/fs/hfs/inode.c | 4 ++++
 trunk/fs/hfs/mdb.c   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfc90f2b50b5..28c8b813148f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 251eb40f5ccd07a905633a816fbf8f2b6b25cced
+refs/heads/master: eb2e5f452a1456c7a20f7566a24d5a8f6ef3edd5
diff --git a/trunk/fs/hfs/inode.c b/trunk/fs/hfs/inode.c
index 9435dda8f1e0..a1cbff2b4d99 100644
--- a/trunk/fs/hfs/inode.c
+++ b/trunk/fs/hfs/inode.c
@@ -70,6 +70,10 @@ static int hfs_releasepage(struct page *page, gfp_t mask)
 		BUG();
 		return 0;
 	}
+
+	if (!tree)
+		return 0;
+
 	if (tree->node_size >= PAGE_CACHE_SIZE) {
 		nidx = page->index >> (tree->node_size_shift - PAGE_CACHE_SHIFT);
 		spin_lock(&tree->hash_lock);
diff --git a/trunk/fs/hfs/mdb.c b/trunk/fs/hfs/mdb.c
index 36ca2e1a4fa3..7b6165f25fbe 100644
--- a/trunk/fs/hfs/mdb.c
+++ b/trunk/fs/hfs/mdb.c
@@ -349,6 +349,7 @@ void hfs_mdb_put(struct super_block *sb)
 	if (HFS_SB(sb)->nls_disk)
 		unload_nls(HFS_SB(sb)->nls_disk);
 
+	free_pages((unsigned long)HFS_SB(sb)->bitmap, PAGE_SIZE < 8192 ? 1 : 0);
 	kfree(HFS_SB(sb));
 	sb->s_fs_info = NULL;
 }