NTFS: FileRecord: UpdateSegments: Set AttributeRecord's Instance value using NextAttributeInstance of the FileRecordSegment containing it

Author: TalAloni

DiskAccessLibrary/FileSystems/NTFS/AttributeData/AttributeData.cs

@@ -214,7 +214,6 @@ public void Extend(ulong additionalLengthInBytes)
                         throw new DiskFullException();
                     }
                     NonResidentAttributeRecord attributeRecord = NonResidentAttributeRecord.Create(m_attributeRecord.AttributeType, m_attributeRecord.Name);
-                    attributeRecord.Instance = m_attributeRecord.Instance;
                     NonResidentAttributeData attributeData = new NonResidentAttributeData(m_volume, null, attributeRecord);
                     attributeData.Extend(finalDataLength);
                     attributeData.WriteClusters(0, data);

DiskAccessLibrary/FileSystems/NTFS/FileRecord/FileRecord.cs

@@ -40,6 +40,7 @@ public void UpdateSegments(int bytesPerFileRecordSegment, byte minorNTFSVersion)
             foreach (FileRecordSegment segment in m_segments)
             {
                 segment.ImmediateAttributes.Clear();
+                segment.NextAttributeInstance = 0;
             }
 
             int segmentLength = bytesPerFileRecordSegment - FileRecordSegment.GetNumberOfBytesAvailable(bytesPerFileRecordSegment, minorNTFSVersion);
@@ -54,7 +55,7 @@ public void UpdateSegments(int bytesPerFileRecordSegment, byte minorNTFSVersion)
                 // A single record segment is needed
                 foreach (AttributeRecord attribute in attributes)
                 {
-                    m_segments[0].ImmediateAttributes.Add(attribute);
+                    m_segments[0].AddAttributeRecord(attribute);
                 }
 
                 // Free the rest of the segments, if there are any
@@ -86,8 +87,6 @@ public AttributeRecord CreateAttributeRecord(AttributeType type, string name)
         {
             bool isResident = (type != AttributeType.IndexAllocation);
             AttributeRecord attribute = AttributeRecord.Create(type, name, isResident);
-            attribute.Instance = m_segments[0].NextAttributeInstance;
-            m_segments[0].NextAttributeInstance++;
             FileRecordHelper.InsertSorted(this.Attributes, attribute);
             return attribute;
         }

DiskAccessLibrary/FileSystems/NTFS/FileRecord/FileRecordHelper.cs

@@ -41,8 +41,7 @@ public static List<AttributeRecord> GetAssembledAttributes(List<FileRecordSegmen
 
                     if (!additionalFragment && fragments.Count > 0)
                     {
-                        NonResidentAttributeRecord assembledAttribute = AssembleFragments(fragments, segments[0].NextAttributeInstance);
-                        segments[0].NextAttributeInstance++;
+                        NonResidentAttributeRecord assembledAttribute = AssembleFragments(fragments);
                         result.Add(assembledAttribute);
                         fragments.Clear();
                     }
@@ -65,15 +64,14 @@ public static List<AttributeRecord> GetAssembledAttributes(List<FileRecordSegmen
 
             if (fragments.Count > 0)
             {
-                NonResidentAttributeRecord assembledAttribute = AssembleFragments(fragments, segments[0].NextAttributeInstance);
-                segments[0].NextAttributeInstance++;
+                NonResidentAttributeRecord assembledAttribute = AssembleFragments(fragments);
                 result.Add(assembledAttribute);
             }
 
             return result;
         }
 
-        private static NonResidentAttributeRecord AssembleFragments(List<NonResidentAttributeRecord> attributeFragments, ushort nextAttributeInstance)
+        private static NonResidentAttributeRecord AssembleFragments(List<NonResidentAttributeRecord> attributeFragments)
         {
             // Attribute fragments are written to disk sorted by LowestVCN
             NonResidentAttributeRecord firstFragment = attributeFragments[0];
@@ -84,7 +82,6 @@ private static NonResidentAttributeRecord AssembleFragments(List<NonResidentAttr
             }
 
             NonResidentAttributeRecord attribute = NonResidentAttributeRecord.Create(firstFragment.AttributeType, firstFragment.Name);
-            attribute.Instance = nextAttributeInstance;
             attribute.Flags = firstFragment.Flags;
             attribute.LowestVCN = 0;
             attribute.HighestVCN = -1;
@@ -130,12 +127,12 @@ public static void SliceAttributes(List<FileRecordSegment> segments, List<Attrib
                 if (attribute.AttributeType == AttributeType.StandardInformation ||
                     attribute.AttributeType == AttributeType.FileName)
                 {
-                    baseFileRecordSegment.ImmediateAttributes.Add(attribute);
+                    baseFileRecordSegment.AddAttributeRecord(attribute);
                 }
                 else if (isMftFileRecord && attribute.AttributeType == AttributeType.Data)
                 {
                     List<NonResidentAttributeRecord> slices = SliceAttributeRecord((NonResidentAttributeRecord)attribute, bytesPerFileRecordSegment / 2, bytesAvailableInSegment);
-                    baseFileRecordSegment.ImmediateAttributes.Add(slices[0]);
+                    baseFileRecordSegment.AddAttributeRecord(slices[0]);
                     slices.RemoveAt(0);
                     foreach (NonResidentAttributeRecord slice in slices)
                     {
@@ -166,13 +163,8 @@ public static void SliceAttributes(List<FileRecordSegment> segments, List<Attrib
                 if (attribute.RecordLength <= remainingLengthInCurrentSegment)
                 {
                     remainingLengthInCurrentSegment -= (int)attribute.RecordLength;
-                    segments[segmentIndex].ImmediateAttributes.Add(attribute);
+                    segments[segmentIndex].AddAttributeRecord(attribute);
                     remainingAttributes.RemoveFirst();
-                    // Instead of renumbering each attribute slice in the new FileRecordSegment, we use the original Instance number.
-                    if (segments[segmentIndex].NextAttributeInstance <= attribute.Instance)
-                    {
-                        segments[segmentIndex].NextAttributeInstance = (ushort)(attribute.Instance + 1);
-                    }
                 }
                 else
                 {
@@ -219,9 +211,7 @@ private static NonResidentAttributeRecord FitMaxNumberOfRuns(NonResidentAttribut
         {
             // Each attribute record is aligned to 8-byte boundary, we must have enough room for padding
             availableLength = (int)Math.Floor((double)availableLength / 8) * 8;
-            // Note that we're using the original record Instance instead of using the FileRecordSegment.NextAttributeInstance
             NonResidentAttributeRecord slice = new NonResidentAttributeRecord(record.AttributeType, record.Name);
-            slice.Instance = record.Instance;
             DataRunSequence dataRuns = record.DataRunSequence;
             long clusterCount = 0;
             for (int index = 0; index < runIndex; index++)