Unverified Commit 9144b438 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Fix sparse problems 



Fixing various problems, detected by sparse.

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 08811ba5

fs/ntfs3/attrib.c

+4 −3
Original line number Diff line number Diff line
@@ -2308,7 +2308,8 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes) 


		if (!attr_b->non_res) {

			/* Still resident. */

			char *data = Add2Ptr(attr_b, attr_b->res.data_off);

			char *data = Add2Ptr(attr_b,

					     le16_to_cpu(attr_b->res.data_off));



			memmove(data + bytes, data, bytes);

			memset(data, 0, bytes);
@@ -2400,8 +2401,8 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes) 
	if (vbo <= ni->i_valid)

		ni->i_valid += bytes;



	attr_b->nres.data_size = le64_to_cpu(data_size + bytes);

	attr_b->nres.alloc_size = le64_to_cpu(alloc_size + bytes);

	attr_b->nres.data_size = cpu_to_le64(data_size + bytes);

	attr_b->nres.alloc_size = cpu_to_le64(alloc_size + bytes);



	/* ni->valid may be not equal valid_size (temporary). */

	if (ni->i_valid > data_size + bytes)

fs/ntfs3/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ int ntfs_utf16_to_nls(struct ntfs_sb_info *sbi, const __le16 *name, u32 len, 


	if (!nls) {

		/* UTF-16 -> UTF-8 */

		ret = utf16s_to_utf8s(name, len, UTF16_LITTLE_ENDIAN, buf,

				      buf_len);

		ret = utf16s_to_utf8s((wchar_t *)name, len, UTF16_LITTLE_ENDIAN,

				      buf, buf_len);

		buf[ret] = '\0';

		return ret;

	}

fs/ntfs3/frecord.c

+1 −2
Original line number Diff line number Diff line
@@ -1670,8 +1670,7 @@ struct ATTR_FILE_NAME *ni_fname_name(struct ntfs_inode *ni, 
		goto next;



	fns = (struct le_str *)&fname->name_len;

	if (ntfs_cmp_names(uni->name, uni->len, fns->name, fns->len, NULL,

			       false))

	if (ntfs_cmp_names_cpu(uni, fns, NULL, false))

		goto next;



	return fname;

fs/ntfs3/namei.c

+6 −7
Original line number Diff line number Diff line
@@ -427,7 +427,8 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1, 
	unsigned int len2 = name->len;

	unsigned int lm = min(len1, len2);

	unsigned char c1, c2;

	struct cpu_str *uni1, *uni2;

	struct cpu_str *uni1;

	struct le_str *uni2;



	/* First try fast implementation. */

	for (;;) {
@@ -464,8 +465,9 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1, 


	uni2 = Add2Ptr(uni1, 2048);



	ret = ntfs_nls_to_utf16(sbi, name->name, name->len, uni2, NTFS_NAME_LEN,

				UTF16_HOST_ENDIAN);

	ret = ntfs_nls_to_utf16(sbi, name->name, name->len,

				(struct cpu_str *)uni2, NTFS_NAME_LEN,

				UTF16_LITTLE_ENDIAN);

	if (ret < 0)

		goto out;
@@ -474,10 +476,7 @@ static int ntfs_d_compare(const struct dentry *dentry, unsigned int len1, 
		goto out;

	}



	ret = !ntfs_cmp_names(uni1->name, uni1->len, uni2->name, uni2->len,

			      sbi->upcase, false)

		      ? 0

		      : 1;

	ret = !ntfs_cmp_names_cpu(uni1, uni2, sbi->upcase, false) ? 0 : 1;



out:

	__putname(uni1);