Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78fc2e69 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jan Kara
Browse files

udf: improve error management in udf_CS0toNLS() 



Only callsite udf_get_filename() now returns error code as well.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent e9d4cf41

fs/udf/unicode.c

+4 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o, 
		memset(utf_o, 0, sizeof(struct ustr));

		pr_err("unknown compression code (%d) stri=%s\n",

		       cmp_id, ocu_i->u_name);

		return 0;

		return -EINVAL;

	}



	ocu = ocu_i->u_name;
@@ -357,8 +357,9 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen, 
			goto out2;

		}

	} else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) {

		if (!udf_CS0toNLS(UDF_SB(sb)->s_nls_map, filename,

				  unifilename)) {

		ret = udf_CS0toNLS(UDF_SB(sb)->s_nls_map, filename,

				   unifilename);

		if (ret < 0) {

			udf_debug("Failed in udf_get_filename: sname = %s\n",

				  sname);

			goto out2;