summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Kwan <joshk@triplehelix.org>2006-01-06 00:09:45 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:20 -0800
commitbd6a59b22fd3bd044bb14978b885bcd042a10e8e (patch)
tree5cfad676f7985f657b831f4fc6ad7a9367ec6c4d
parent9f155b9802bb7049cd0f216c3fe903b58620df11 (diff)
[PATCH] hfsplus oops fix
nls_utf8 is available, and the check in hfsplus_fill_super checks the wrong pointer for NULLness (it checks the saved nls, not the new one that it needs to use.) Signed-off-by: Joshua Kwan <joshk@triplehelix.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/hfsplus/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 8093351bd7c..6daaf7c755a 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -320,7 +320,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
/* temporarily use utf8 to correctly find the hidden dir below */
nls = sbi->nls;
sbi->nls = load_nls("utf8");
- if (!nls) {
+ if (!sbi->nls) {
printk("HFS+: unable to load nls for utf8\n");
err = -EINVAL;
goto cleanup;