From 8463b2bff37978124e5210a59590f1ac33e453c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 26 Jun 2022 22:19:29 -0600 Subject: use devid instead of devuuid, add a Mapping struct --- cmd/btrfs-fsck/pass1.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/btrfs-fsck') diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go index aada80d..fada257 100644 --- a/cmd/btrfs-fsck/pass1.go +++ b/cmd/btrfs-fsck/pass1.go @@ -229,7 +229,7 @@ func pass1ReconstructChunksOneDev( resolvedPAddrs, _ := fs.Resolve(laddr) for _, readPAddr := range readPAddrs { if _, ok := resolvedPAddrs[btrfs.QualifiedPhysicalAddr{ - Dev: superblock.Data.DevItem.DevUUID, + Dev: superblock.Data.DevItem.DevID, Addr: readPAddr, }]; !ok { lostAndFoundNodes[readPAddr] = laddr @@ -288,7 +288,7 @@ func pass1ReconstructChunksOneDev( panic("TODO: mismatch") } chunk.Stripes = append(chunk.Stripes, btrfsitem.ChunkStripe{ - DeviceID: superblock.Data.DevItem.DeviceID, + DeviceID: superblock.Data.DevItem.DevID, DeviceUUID: superblock.Data.DevItem.DevUUID, Offset: stripe.PAddr, }) -- cgit v1.2.3-2-g168b