From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933494AbbLXQ2k (ORCPT ); Thu, 24 Dec 2015 11:28:40 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:56907 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933060AbbLXQ0x (ORCPT ); Thu, 24 Dec 2015 11:26:53 -0500 From: Andrew Gabbasov To: Jan Kara , Subject: [PATCH v2 3/7] udf: Parameterize output length in udf_put_filename Date: Thu, 24 Dec 2015 10:25:34 -0600 Message-ID: <1450974338-22762-4-git-send-email-andrew_gabbasov@mentor.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1450974338-22762-1-git-send-email-andrew_gabbasov@mentor.com> References: <1450974338-22762-1-git-send-email-andrew_gabbasov@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make the desired output length a parameter rather than have it hard-coded to UDF_NAME_LEN. Although all call sites still have this length the same, this parameterization will make the function more universal and also consistent with udf_get_filename. Signed-off-by: Andrew Gabbasov --- fs/udf/namei.c | 10 ++++++---- fs/udf/udfdecl.h | 4 ++-- fs/udf/unicode.c | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fs/udf/namei.c b/fs/udf/namei.c index c97b5a8..6192070 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -362,8 +362,9 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, *err = -EINVAL; goto out_err; } - namelen = udf_put_filename(sb, dentry->d_name.name, name, - dentry->d_name.len); + namelen = udf_put_filename(sb, dentry->d_name.name, + dentry->d_name.len, + name, UDF_NAME_LEN); if (!namelen) { *err = -ENAMETOOLONG; goto out_err; @@ -996,8 +997,9 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, } if (pc->componentType == 5) { - namelen = udf_put_filename(sb, compstart, name, - symname - compstart); + namelen = udf_put_filename(sb, compstart, + symname - compstart, + name, UDF_NAME_LEN); if (!namelen) goto out_no_entry; diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 47bb3f5..35591e3 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -213,8 +213,8 @@ udf_get_lb_pblock(struct super_block *sb, struct kernel_lb_addr *loc, /* unicode.c */ extern int udf_get_filename(struct super_block *, uint8_t *, int, uint8_t *, int); -extern int udf_put_filename(struct super_block *, const uint8_t *, uint8_t *, - int); +extern int udf_put_filename(struct super_block *, const uint8_t *, int, + uint8_t *, int); extern int udf_build_ustr(struct ustr *, dstring *, int); extern int udf_CS0toUTF8(struct ustr *, const struct ustr *); diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index 155f912..13e8b69 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c @@ -388,22 +388,22 @@ out1: return ret; } -int udf_put_filename(struct super_block *sb, const uint8_t *sname, - uint8_t *dname, int flen) +int udf_put_filename(struct super_block *sb, const uint8_t *sname, int slen, + uint8_t *dname, int dlen) { struct ustr unifilename; int namelen; - if (!udf_char_to_ustr(&unifilename, sname, flen)) + if (!udf_char_to_ustr(&unifilename, sname, slen)) return 0; if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) { - namelen = udf_UTF8toCS0(dname, &unifilename, UDF_NAME_LEN); + namelen = udf_UTF8toCS0(dname, &unifilename, dlen); if (!namelen) return 0; } else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) { namelen = udf_NLStoCS0(UDF_SB(sb)->s_nls_map, dname, - &unifilename, UDF_NAME_LEN); + &unifilename, dlen); if (!namelen) return 0; } else -- 2.1.0