Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / udf / super.c

diff --git a/fs/udf/super.c b/fs/udf/super.c
index f64691f2168a3b8d8e1515f89e7ef5e60fefd7b5..a143461373614bd295f37739036a6edb54a48885 100644 (file)
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -566,6 +566,11 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
                        if (!remount) {
                                if (uopt->nls_map)
                                        unload_nls(uopt->nls_map);
+                               /*
+                                * load_nls() failure is handled later in
+                                * udf_fill_super() after all options are
+                                * parsed.
+                                */
                                uopt->nls_map = load_nls(args[0].from);
                                uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
                        }