[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>

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 8093351bd7c3b0a9cefcb73ce1879a0527655c6e..6daaf7c755a6894a9e1616d778e8b9816f9945ae 100644 (file)
--- 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;