Commit 4ebcf3f9 authored by Hyunchul Lee's avatar Hyunchul Lee Committed by Namjae Jeon
Browse files

ntfs: drop nlink once for WIN32/DOS aliases 



NTFS could store a filename as paired WIN32 and DOS $FILE_NAME attributes
for directories. But ntfs_delete() deleted both attributes for unlinking
a directory, but it also called drop_nlink() for each attributes.
This could trigger warnings when unlinking directories.

Signed-off-by: default avatarHyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
parent d986ba03

fs/ntfs/namei.c

+11 −2
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ static int ntfs_delete(struct ntfs_inode *ni, struct ntfs_inode *dir_ni, 


	ni_mrec = actx->base_mrec ? actx->base_mrec : actx->mrec;

	ni_mrec->link_count = cpu_to_le16(le16_to_cpu(ni_mrec->link_count) - 1);

	if (!S_ISDIR(VFS_I(ni)->i_mode))

		drop_nlink(VFS_I(ni));



	mark_mft_record_dirty(ni);
@@ -955,6 +956,13 @@ static int ntfs_delete(struct ntfs_inode *ni, struct ntfs_inode *dir_ni, 
		goto search;

	}



	/*

	 * For directories, Drop VFS nlink only when mft record link count

	 * becomes zero. Because we fixes VFS nlink to 1 for directories.

	 */

	if (S_ISDIR(VFS_I(ni)->i_mode) && !le16_to_cpu(ni_mrec->link_count))

		drop_nlink(VFS_I(ni));



	/*

	 * If hard link count is not equal to zero then we are done. In other

	 * case there are no reference to this inode left, so we should free all
@@ -1221,6 +1229,7 @@ static int __ntfs_link(struct ntfs_inode *ni, struct ntfs_inode *dir_ni, 
	}

	/* Increment hard links count. */

	ni_mrec->link_count = cpu_to_le16(le16_to_cpu(ni_mrec->link_count) + 1);

	if (!S_ISDIR(vi->i_mode))

		inc_nlink(VFS_I(ni));



	/* Done! */