---

yaml --- r: 143193 b: refs/heads/master c: eb2e5f4 h: refs/heads/master i: 143191: fc7a0c3 v: v3
git-mirror · Apr 13, 2009 · 886a5a8 · 886a5a8
1 parent 7d6263a
commit 886a5a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
 }