fs/ntfs3: Taking DOS names into account during link counting

When counting and checking hard links in an ntfs file record,

  struct MFT_REC {
    struct NTFS_RECORD_HEADER rhdr; // 'FILE'
    __le16 seq;		    // 0x10: Sequence number for this record.
>>  __le16 hard_links;	// 0x12: The number of hard links to record.
    __le16 attr_off;	// 0x14: Offset to attributes.
  ...

the ntfs3 driver ignored short names (DOS names), causing the link count
to be reduced by 1 and messages to be output to dmesg.

For Windows, such a situation is a minor error, meaning chkdsk does not report
errors on such a volume, and in the case of using the /f switch, it silently
corrects them, reporting that no errors were found. This does not affect
the consistency of the file system.

Nevertheless, the behavior in the ntfs3 driver is incorrect and
changes the content of the file system. This patch should fix that.

PS: most likely, there has been a confusion of concepts
MFT_REC::hard_links and inode::__i_nlink.

Fixes: 82cae269cfa95 ("fs/ntfs3: Add initialization of super block")
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: stable@vger.kernel.org

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index eb7a8c9fba0183f40096d673473be4dffaa7c4c8..05f169018c4e99fbfb64baf5b34b670866a4b402 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -37,7 +37,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,
        bool is_dir;
        unsigned long ino = inode->i_ino;
        u32 rp_fa = 0, asize, t32;
-       u16 roff, rsize, names = 0;
+       u16 roff, rsize, names = 0, links = 0;
        const struct ATTR_FILE_NAME *fname = NULL;
        const struct INDEX_ROOT *root;
        struct REPARSE_DATA_BUFFER rp; // 0x18 bytes
@@ -200,11 +200,12 @@ next_attr:
                    rsize < SIZEOF_ATTRIBUTE_FILENAME)
                        goto out;
 
+               names += 1;
                fname = Add2Ptr(attr, roff);
                if (fname->type == FILE_NAME_DOS)
                        goto next_attr;
 
-               names += 1;
+               links += 1;
                if (name && name->len == fname->name_len &&
                    !ntfs_cmp_names_cpu(name, (struct le_str *)&fname->name_len,
                                        NULL, false))
@@ -429,7 +430,7 @@ end_enum:
                ni->mi.dirty = true;
        }
 
-       set_nlink(inode, names);
+       set_nlink(inode, links);
 
        if (S_ISDIR(mode)) {
                ni->std_fa |= FILE_ATTRIBUTE_DIRECTORY;

diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index 6aa3a9d44df1bdc90f56a947caf94c902590d983..6c76503edc200da63711188a24102213e9b33454 100644 (file)
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -534,16 +534,9 @@ bool mi_remove_attr(struct ntfs_inode *ni, struct mft_inode *mi,
        if (aoff + asize > used)
                return false;
 
-       if (ni && is_attr_indexed(attr)) {
+       if (ni && is_attr_indexed(attr) && attr->type == ATTR_NAME) {
                u16 links = le16_to_cpu(ni->mi.mrec->hard_links);
-               struct ATTR_FILE_NAME *fname =
-                       attr->type != ATTR_NAME ?
-                               NULL :
-                               resident_data_ex(attr,
-                                                SIZEOF_ATTRIBUTE_FILENAME);
-               if (fname && fname->type == FILE_NAME_DOS) {
-                       /* Do not decrease links count deleting DOS name. */
-               } else if (!links) {
+               if (!links) {
                        /* minor error. Not critical. */
                } else {
                        ni->mi.mrec->hard_links = cpu_to_le16(links - 1);