Commit f94ad38e authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

NTFS: Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING 


      messages and include the inode number.  Thanks to Yura Pakhuchiy for
      pointing this out.

Signed-off-by: default avatarAnton Altaparmakov <aia21@cantab.net>
parent 2b0ada2b

fs/ntfs/ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ ToDo/Notes: 
	- Remove two bogus BUG_ON()s from fs/ntfs/mft.c.

	- Fix handling of valid but empty mapping pairs array in

	  fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress().

	- Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING

	  messages and include the inode number.  Thanks to Yura Pakhuchiy for

	  pointing this out.



2.1.23 - Implement extension of resident files and make writing safe as well as

	 many bug fixes, cleanups, and enhancements...

fs/ntfs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,8 @@ static inline int ntfs_filldir(ntfs_volume *vol, loff_t fpos, 
			ie->key.file_name.file_name_length, &name,

			NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1);

	if (name_len <= 0) {

		ntfs_debug("Skipping unrepresentable file.");

		ntfs_warning(vol->sb, "Skipping unrepresentable inode 0x%llx.",

				(long long)MREF_LE(ie->data.dir.indexed_file));

		return 0;

	}

	if (ie->key.file_name.file_attributes &

fs/ntfs/unistr.c

+2 −1
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ retry: wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o, 
	return -EINVAL;

conversion_err:

	ntfs_error(vol->sb, "Unicode name contains characters that cannot be "

			"converted to character set %s.", nls->charset);

			"converted to character set %s.  You might want to "

			"try to use the mount option nls=utf8.", nls->charset);

	if (ns != *outs)

		kfree(ns);

	if (wc != -ENAMETOOLONG)

CRA Git | Maintained and supported by SUSTech CRA and CCSE