[xfs-btree-bugfix] Fix bug in XFS B+tree inode

In XFS source code, bb_leftsib and bb_rightsib (declared in xfs_format.h) are both of type __be32, which is an unsigned int32 (and not 64).
While I was there, I added Inode.ToString() to help me differentiate beween inodes: In Linux, inodes are identified by a unique ID.

Branch: [xfs-btree-bugfix]

Author: Assaf Tzur-El

Library/DiscUtils.Xfs/BTreeExtentHeader.cs

@@ -40,18 +40,15 @@ internal abstract class BTreeExtentHeader : IByteArraySerializable
 
         public long RightSibling { get; private set; }
 
-        public virtual int Size
-        {
-            get { return 24; }
-        }
+        public virtual int Size => 24;
 
         public virtual int ReadFrom(byte[] buffer, int offset)
         {
             Magic = EndianUtilities.ToUInt32BigEndian(buffer, offset);
             Level = EndianUtilities.ToUInt16BigEndian(buffer, offset + 0x4);
             NumberOfRecords = EndianUtilities.ToUInt16BigEndian(buffer, offset + 0x6);
-            LeftSibling = EndianUtilities.ToInt64BigEndian(buffer, offset + 0x8);
-            RightSibling = EndianUtilities.ToInt64BigEndian(buffer, offset + 0xC);
+            LeftSibling = EndianUtilities.ToInt32BigEndian(buffer, offset + 0x8);
+            RightSibling = EndianUtilities.ToInt32BigEndian(buffer, offset + 0xC);
             return 24;
         }
 

Library/DiscUtils.Xfs/Inode.cs

@@ -31,6 +31,7 @@ internal class Inode : IByteArraySerializable
     {
         public Inode(ulong number, Context context)
         {
+            Number = number;
             var sb = context.SuperBlock;
             RelativeInodeNumber = (uint) (number & sb.RelativeInodeMask);
             AllocationGroup = (uint) ((number & sb.AgInodeMask) >> (sb.AgBlocksLog2 + sb.InodesPerBlockLog2));
@@ -57,6 +58,8 @@ public Inode(uint allocationGroup, uint relInode)
 
         public uint BlockOffset { get; private set; }
 
+        public ulong Number { get; }
+
         public const ushort InodeMagic = 0x494e;
         /// <summary>
         /// The inode signature where these two bytes are 0x494e, or "IN" in ASCII.
@@ -319,5 +322,10 @@ public IBuffer BufferFromExtentList(Context context, IList<Extent> extents)
             }
             return new StreamBuffer(new ExtentStream((long) this.Length, builderExtents), Ownership.Dispose);
         }
+
+        public override string ToString()
+        {
+            return "inode " + Number;
+        }
     }
 }