From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755083AbbDIIht (ORCPT ); Thu, 9 Apr 2015 04:37:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57807 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753569AbbDIIhr (ORCPT ); Thu, 9 Apr 2015 04:37:47 -0400 Date: Thu, 9 Apr 2015 10:37:42 +0200 From: Jan Kara To: Fabian Frederick Cc: linux-kernel@vger.kernel.org, Jan Kara Subject: Re: [PATCH V2 5/9 linux-next] udf: improve error management in udf_CS0toNLS() Message-ID: <20150409083742.GE18044@quack.suse.cz> References: <1428521039-18491-1-git-send-email-fabf@skynet.be> <1428521039-18491-6-git-send-email-fabf@skynet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428521039-18491-6-git-send-email-fabf@skynet.be> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Fabian Frederick > --- > 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 SUSE Labs, CR