On Wed 08-04-15 21:23:55, Fabian Frederick wrote:
> Only callsite udf_get_filename() now returns
> error code as well.
Did same modification as in the previous patch. Otherwise OK, so I've
merged the patch.
Honza
>
> Suggested-by: Jan Kara <[email protected]>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> fs/udf/unicode.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
> index 9008a36..488a838 100644
> --- a/fs/udf/unicode.c
> +++ b/fs/udf/unicode.c
> @@ -257,7 +257,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct
> ustr *utf_o,
> ocu_len = ocu_i->u_len;
> if (ocu_len == 0) {
> memset(utf_o, 0, sizeof(struct ustr));
> - return 0;
> + return -EINVAL;
> }
>
> cmp_id = ocu_i->u_cmpID;
> @@ -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;
> --
> 1.9.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
