ntfs: drop nlink once for WIN32/DOS aliases
Subsystems (2)
Hyunchul Lee
maintainerPATCH 1/1 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 Hyunchul Lee <[email protected]>
--- fs/ntfs/namei.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/ntfs/namei.c +11 -2
@@ -945,7 +945,8 @@ 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 ); -drop_nlink (VFS_I (ni)); +if (!S_ISDIR (VFS_I (ni)->i_mode)) +drop_nlink (VFS_I (ni));mark_mft_record_dirty (ni);if (looking_for_dos_name) {
@@ -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,7 +1229,8 @@ 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 ); -inc_nlink (VFS_I (ni)); +if (!S_ISDIR (vi->i_mode)) +inc_nlink (VFS_I (ni));/* Done! */ mark_mft_record_dirty (ni);
Signature · 1 line
2.43.0
Quoted 11 lines · Hyunchul Lee
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 calleddrop_nlink()for each attributes.This could trigger warnings when unlinking directories.
Signed-off-by Hyunchul Lee <[email protected]>
Applied it to #ntfs-next.
Thanks!