This is a note to let you know that I've just added the patch titled
udf: Explain handling of load_nls() failure
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
udf-explain-handling-of-load_nls-failure.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 5f0df85dbac02885d8788d43db7a2a9e2c8db0f3
Author: Jan Kara <jack@xxxxxxx>
Date: Tue Mar 19 09:48:59 2019 +0100
udf: Explain handling of load_nls() failure
[ Upstream commit a768a9abc625d554f7b6428517089c193fcb5962 ]
Add comment explaining that load_nls() failure gets handled back in
udf_fill_super() to avoid false impression that it is unhandled.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Stable-dep-of: fc8033a34a3c ("udf: Preserve link count of system files")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/fs/udf/super.c b/fs/udf/super.c
index b7fb7cd35d89a..5d179616578cf 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -572,6 +572,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);
}
