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

Commit 525e2c56 authored by Andrew Gabbasov's avatar Andrew Gabbasov Committed by Jan Kara
Browse files

udf: Parameterize output length in udf_put_filename 



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: default avatarAndrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 7955118e

fs/udf/namei.c

+6 −4
Original line number Diff line number Diff line
@@ -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;
@@ -997,8 +998,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;

fs/udf/udfdecl.h

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,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 *);

fs/udf/unicode.c

+5 −5
Original line number Diff line number Diff line
@@ -395,22 +395,22 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen, 
	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