Unverified Commit 22457c04 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Modified fix directory element type detection 



Unfortunately reparse attribute is used for many purposes (several dozens).
It is not possible here to know is this name symlink or not.
To get exactly the type of name we should to open inode (read mft).
getattr for opened file (fstat) correctly returns symlink.

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

fs/ntfs3/dir.c

+25 −5
Original line number Diff line number Diff line
@@ -309,12 +309,32 @@ static inline int ntfs_filldir(struct ntfs_sb_info *sbi, struct ntfs_inode *ni, 
		return 0;

	}



	/* NTFS: symlinks are "dir + reparse" or "file + reparse" */

	if (fname->dup.fa & FILE_ATTRIBUTE_REPARSE_POINT)

		dt_type = DT_LNK;

	else

	/*

	 * NTFS: symlinks are "dir + reparse" or "file + reparse"

	 * Unfortunately reparse attribute is used for many purposes (several dozens).

	 * It is not possible here to know is this name symlink or not.

	 * To get exactly the type of name we should to open inode (read mft).

	 * getattr for opened file (fstat) correctly returns symlink.

	 */

	dt_type = (fname->dup.fa & FILE_ATTRIBUTE_DIRECTORY) ? DT_DIR : DT_REG;



	/*

	 * It is not reliable to detect the type of name using duplicated information

	 * stored in parent directory.

	 * The only correct way to get the type of name - read MFT record and find ATTR_STD.

	 * The code below is not good idea.

	 * It does additional locks/reads just to get the type of name.

	 * Should we use additional mount option to enable branch below?

	 */

	if ((fname->dup.fa & FILE_ATTRIBUTE_REPARSE_POINT) &&

	    ino != ni->mi.rno) {

		struct inode *inode = ntfs_iget5(sbi->sb, &e->ref, NULL);

		if (!IS_ERR_OR_NULL(inode)) {

			dt_type = fs_umode_to_dtype(inode->i_mode);

			iput(inode);

		}

	}



	return !dir_emit(ctx, (s8 *)name, name_len, ino, dt_type);

}