summaryrefslogtreecommitdiff
path: root/pkg/btrfs
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2022-06-11 22:30:35 -0600
committerLuke Shumaker <lukeshu@lukeshu.com>2022-06-11 22:38:48 -0600
commit6fc5d416a289235dd4bb56d29fb96c5a003ea89f (patch)
treee35bb16c46c2ad8d8563b42e12a1e95cbd936dc7 /pkg/btrfs
parentf1a212cddb8dc051c510327c365da42e30b23ab9 (diff)
use %v when possible
Exceptions are - the occasional %x when the type is a basic int - %w - %q - %T - whenever print_tree.go needs to be dumb for compatibility with C
Diffstat (limited to 'pkg/btrfs')
-rw-r--r--pkg/btrfs/btrfsitem/items.go2
-rw-r--r--pkg/btrfs/internal/objid.go2
-rw-r--r--pkg/btrfs/io1_device.go6
-rw-r--r--pkg/btrfs/io2_fs.go30
-rw-r--r--pkg/btrfs/types_btree.go44
-rw-r--r--pkg/btrfs/types_superblock.go2
6 files changed, 43 insertions, 43 deletions
diff --git a/pkg/btrfs/btrfsitem/items.go b/pkg/btrfs/btrfsitem/items.go
index c4ad7e9..1a3b883 100644
--- a/pkg/btrfs/btrfsitem/items.go
+++ b/pkg/btrfs/btrfsitem/items.go
@@ -65,7 +65,7 @@ func UnmarshalItem(key internal.Key, dat []byte) Item {
if n < len(dat) {
return Error{
Dat: dat,
- Err: fmt.Errorf("btrfsitem.UnmarshalItem({ItemType:%v}, dat): left over data: got %d bytes but only consumed %d",
+ Err: fmt.Errorf("btrfsitem.UnmarshalItem({ItemType:%v}, dat): left over data: got %v bytes but only consumed %v",
key.ItemType, len(dat), n),
}
}
diff --git a/pkg/btrfs/internal/objid.go b/pkg/btrfs/internal/objid.go
index a53d61f..b3f09f6 100644
--- a/pkg/btrfs/internal/objid.go
+++ b/pkg/btrfs/internal/objid.go
@@ -68,7 +68,7 @@ func (id ObjID) Format(typ ItemType) string {
uint64(id)>>48,
uint64(id)&((1<<48)-1))
case UUID_SUBVOL_KEY, UUID_RECEIVED_SUBVOL_KEY:
- return fmt.Sprintf("0x%016x", uint64(id))
+ return fmt.Sprintf("%#016x", uint64(id))
case DEV_ITEM_KEY:
names := map[ObjID]string{
BALANCE_OBJECTID: "BALANCE",
diff --git a/pkg/btrfs/io1_device.go b/pkg/btrfs/io1_device.go
index 978d388..32070cd 100644
--- a/pkg/btrfs/io1_device.go
+++ b/pkg/btrfs/io1_device.go
@@ -56,7 +56,7 @@ func (dev *Device) Superblocks() ([]*util.Ref[PhysicalAddr, Superblock], error)
Addr: addr,
}
if err := superblock.Read(); err != nil {
- return nil, fmt.Errorf("superblock %d: %w", i, err)
+ return nil, fmt.Errorf("superblock %v: %w", i, err)
}
ret = append(ret, superblock)
}
@@ -79,11 +79,11 @@ func (dev *Device) Superblock() (*util.Ref[PhysicalAddr, Superblock], error) {
for i, sb := range sbs {
if err := sb.Data.ValidateChecksum(); err != nil {
- return nil, fmt.Errorf("superblock %d: %w", i, err)
+ return nil, fmt.Errorf("superblock %v: %w", i, err)
}
if i > 0 {
if !sb.Data.Equal(sbs[0].Data) {
- return nil, fmt.Errorf("superblock %d and superblock %d disagree", 0, i)
+ return nil, fmt.Errorf("superblock %v and superblock %v disagree", 0, i)
}
}
}
diff --git a/pkg/btrfs/io2_fs.go b/pkg/btrfs/io2_fs.go
index a59fec4..cb99d14 100644
--- a/pkg/btrfs/io2_fs.go
+++ b/pkg/btrfs/io2_fs.go
@@ -23,9 +23,9 @@ type FS struct {
func (fs *FS) Name() string {
sb, err := fs.Superblock()
if err != nil {
- return fmt.Sprintf("fs_uuid=%s", "(unreadable)")
+ return fmt.Sprintf("fs_uuid=%v", "(unreadable)")
}
- return fmt.Sprintf("fs_uuid=%s", sb.Data.FSUUID)
+ return fmt.Sprintf("fs_uuid=%v", sb.Data.FSUUID)
}
func (fs *FS) Size() (LogicalAddr, error) {
@@ -76,13 +76,13 @@ func (fs *FS) Superblock() (*util.Ref[PhysicalAddr, Superblock], error) {
}
if err := sb.Data.ValidateChecksum(); err != nil {
- return nil, fmt.Errorf("file %q superblock %d: %w", sb.File.Name(), sbi, err)
+ return nil, fmt.Errorf("file %q superblock %v: %w", sb.File.Name(), sbi, err)
}
if i > 0 {
// This is probably wrong, but lots of my
// multi-device code is probably wrong.
if !sb.Data.Equal(sbs[0].Data) {
- return nil, fmt.Errorf("file %q superblock %d and file %q superblock %d disagree",
+ return nil, fmt.Errorf("file %q superblock %v and file %q superblock %v disagree",
sbs[0].File.Name(), 0,
sb.File.Name(), sbi)
}
@@ -110,7 +110,7 @@ func (fs *FS) Init() error {
b.Checksum = CSum{}
b.Self = 0
if !reflect.DeepEqual(a, b) {
- return fmt.Errorf("file %q: superblock %d disagrees with superblock 0",
+ return fmt.Errorf("file %q: superblock %v disagrees with superblock 0",
dev.Name(), i+1)
}
}
@@ -158,12 +158,12 @@ func (fs *FS) Resolve(laddr LogicalAddr) (paddrs map[QualifiedPhysicalAddr]struc
maxlen = math.MaxUint64
for _, chunk := range fs.chunks {
- low := chunk.Key.Offset
- high := chunk.Key.Offset + uint64(chunk.Chunk.Head.Size)
- match := low <= uint64(laddr) && uint64(laddr) < high
+ low := LogicalAddr(chunk.Key.Offset)
+ high := low + LogicalAddr(chunk.Chunk.Head.Size)
+ match := low <= laddr && laddr < high
if dbg2 {
- fmt.Printf("DBG: 0x%0x <= 0x%0x < 0x%0x : %v\n",
- low, uint64(laddr), high, match)
+ fmt.Printf("DBG: %v <= %v < %v : %v\n",
+ low, laddr, high, match)
}
if match {
offsetWithinChunk := uint64(laddr) - chunk.Key.Offset
@@ -213,16 +213,16 @@ func (fs *FS) maybeShortReadAt(dat []byte, laddr LogicalAddr) (int, error) {
for paddr := range paddrs {
dev, ok := fs.uuid2dev[paddr.Dev]
if !ok {
- return 0, fmt.Errorf("device=%s does not exist", paddr.Dev)
+ return 0, fmt.Errorf("device=%v does not exist", paddr.Dev)
}
if _, err := dev.ReadAt(buf, paddr.Addr); err != nil {
- return 0, fmt.Errorf("read device=%s paddr=%v: %w", paddr.Dev, paddr.Addr, err)
+ return 0, fmt.Errorf("read device=%v paddr=%v: %w", paddr.Dev, paddr.Addr, err)
}
if first {
copy(dat, buf)
} else {
if !bytes.Equal(dat, buf) {
- return 0, fmt.Errorf("inconsistent stripes at laddr=%v len=%d", laddr, len(dat))
+ return 0, fmt.Errorf("inconsistent stripes at laddr=%v len=%v", laddr, len(dat))
}
}
}
@@ -253,10 +253,10 @@ func (fs *FS) maybeShortWriteAt(dat []byte, laddr LogicalAddr) (int, error) {
for paddr := range paddrs {
dev, ok := fs.uuid2dev[paddr.Dev]
if !ok {
- return 0, fmt.Errorf("device=%s does not exist", paddr.Dev)
+ return 0, fmt.Errorf("device=%v does not exist", paddr.Dev)
}
if _, err := dev.WriteAt(dat, paddr.Addr); err != nil {
- return 0, fmt.Errorf("write device=%s paddr=%v: %w", paddr.Dev, paddr.Addr, err)
+ return 0, fmt.Errorf("write device=%v paddr=%v: %w", paddr.Dev, paddr.Addr, err)
}
}
return len(dat), nil
diff --git a/pkg/btrfs/types_btree.go b/pkg/btrfs/types_btree.go
index e58e33b..8a32d9d 100644
--- a/pkg/btrfs/types_btree.go
+++ b/pkg/btrfs/types_btree.go
@@ -104,7 +104,7 @@ func (node Node) ValidateChecksum() error {
return err
}
if calced != stored {
- return fmt.Errorf("node checksum mismatch: stored=%s calculated=%s",
+ return fmt.Errorf("node checksum mismatch: stored=%v calculated=%v",
stored, calced)
}
return nil
@@ -132,7 +132,7 @@ func (node *Node) UnmarshalBinary(nodeBuf []byte) (int, error) {
}
}
if n != len(nodeBuf) {
- return n, fmt.Errorf("btrfs.Node.UnmarshalBinary: left over data: got %d bytes but only consumed %d",
+ return n, fmt.Errorf("btrfs.Node.UnmarshalBinary: left over data: got %v bytes but only consumed %v",
len(nodeBuf), n)
}
return n, nil
@@ -143,7 +143,7 @@ func (node Node) MarshalBinary() ([]byte, error) {
return nil, fmt.Errorf("btrfs.Node.MarshalBinary: .Size must be set")
}
if node.Size <= uint32(binstruct.StaticSize(NodeHeader{})) {
- return nil, fmt.Errorf("btrfs.Node.MarshalBinary: .Size must be greater than %d",
+ return nil, fmt.Errorf("btrfs.Node.MarshalBinary: .Size must be greater than %v",
binstruct.StaticSize(NodeHeader{}))
}
if node.Head.Level > 0 {
@@ -157,7 +157,7 @@ func (node Node) MarshalBinary() ([]byte, error) {
if bs, err := binstruct.Marshal(node.Head); err != nil {
return buf, err
} else if len(bs) != binstruct.StaticSize(NodeHeader{}) {
- return nil, fmt.Errorf("btrfs.Node.MarshalBinary: header is %d bytes but expected %d",
+ return nil, fmt.Errorf("btrfs.Node.MarshalBinary: header is %v bytes but expected %v",
len(bs), binstruct.StaticSize(NodeHeader{}))
} else {
copy(buf, bs)
@@ -192,7 +192,7 @@ func (node *Node) unmarshalInternal(bodyBuf []byte) (int, error) {
_n, err := binstruct.Unmarshal(bodyBuf[n:], &item)
n += _n
if err != nil {
- return n, fmt.Errorf("item %d: %w", i, err)
+ return n, fmt.Errorf("item %v: %w", i, err)
}
node.BodyInternal = append(node.BodyInternal, item)
}
@@ -205,16 +205,16 @@ func (node *Node) marshalInternalTo(bodyBuf []byte) error {
for i, item := range node.BodyInternal {
bs, err := binstruct.Marshal(item)
if err != nil {
- return fmt.Errorf("item %d: %w", i, err)
+ return fmt.Errorf("item %v: %w", i, err)
}
if copy(bodyBuf[n:], bs) < len(bs) {
- return fmt.Errorf("item %d: not enough space: need at least %d+%d=%d bytes, but only have %d",
+ return fmt.Errorf("item %v: not enough space: need at least %v+%v=%v bytes, but only have %v",
i, n, len(bs), n+len(bs), len(bodyBuf))
}
n += len(bs)
}
if copy(bodyBuf[n:], node.Padding) < len(node.Padding) {
- return fmt.Errorf("padding: not enough space: need at least %d+%d=%d bytes, but only have %d",
+ return fmt.Errorf("padding: not enough space: need at least %v+%v=%v bytes, but only have %v",
n, len(node.Padding), n+len(node.Padding), len(bodyBuf))
}
return nil
@@ -243,21 +243,21 @@ func (node *Node) unmarshalLeaf(bodyBuf []byte) (int, error) {
n, err := binstruct.Unmarshal(bodyBuf[head:], &item.Head)
head += n
if err != nil {
- return 0, fmt.Errorf("item %d: head: %w", i, err)
+ return 0, fmt.Errorf("item %v: head: %w", i, err)
}
if head > tail {
- return 0, fmt.Errorf("item %d: head: end_offset=0x%0x is in the body section (offset>0x%0x)",
+ return 0, fmt.Errorf("item %v: head: end_offset=%#x is in the body section (offset>%#x)",
i, head, tail)
}
dataOff := int(item.Head.DataOffset)
if dataOff < head {
- return 0, fmt.Errorf("item %d: body: beg_offset=0x%0x is in the head section (offset<0x%0x)",
+ return 0, fmt.Errorf("item %v: body: beg_offset=%#x is in the head section (offset<%#x)",
i, dataOff, head)
}
dataSize := int(item.Head.DataSize)
if dataOff+dataSize != tail {
- return 0, fmt.Errorf("item %d: body: end_offset=0x%0x is not cur_tail=0x%0x)",
+ return 0, fmt.Errorf("item %v: body: end_offset=%#x is not cur_tail=%#x)",
i, dataOff+dataSize, tail)
}
tail = dataOff
@@ -277,17 +277,17 @@ func (node *Node) marshalLeafTo(bodyBuf []byte) error {
for i, item := range node.BodyLeaf {
itemBodyBuf, err := binstruct.Marshal(item.Body)
if err != nil {
- return fmt.Errorf("item %d: body: %w", i, err)
+ return fmt.Errorf("item %v: body: %w", i, err)
}
item.Head.DataSize = uint32(len(itemBodyBuf))
item.Head.DataOffset = uint32(tail - len(itemBodyBuf))
itemHeadBuf, err := binstruct.Marshal(item.Head)
if err != nil {
- return fmt.Errorf("item %d: head: %w", i, err)
+ return fmt.Errorf("item %v: head: %w", i, err)
}
if tail-head < len(itemHeadBuf)+len(itemBodyBuf) {
- return fmt.Errorf("item %d: not enough space: need at least (head_len:%d)+(body_len:%d)=%d free bytes, but only have %d",
+ return fmt.Errorf("item %v: not enough space: need at least (head_len:%v)+(body_len:%v)=%v free bytes, but only have %v",
i, len(itemHeadBuf), len(itemBodyBuf), len(itemHeadBuf)+len(itemBodyBuf), tail-head)
}
@@ -297,7 +297,7 @@ func (node *Node) marshalLeafTo(bodyBuf []byte) error {
copy(bodyBuf[tail:], itemBodyBuf)
}
if copy(bodyBuf[head:tail], node.Padding) < len(node.Padding) {
- return fmt.Errorf("padding: not enough space: need at least %d free bytes, but only have %d",
+ return fmt.Errorf("padding: not enough space: need at least %v free bytes, but only have %v",
len(node.Padding), tail-head)
}
return nil
@@ -333,32 +333,32 @@ func ReadNode[Addr ~int64](fs util.File[Addr], sb Superblock, addr Addr, laddrCB
Addr: addr,
}
if _, err := binstruct.Unmarshal(nodeBuf, &nodeRef.Data.Head); err != nil {
- return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%d: %w", addr, err)
+ return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%v: %w", addr, err)
}
// sanity checking
if nodeRef.Data.Head.MetadataUUID != sb.EffectiveMetadataUUID() {
- return nil, fmt.Errorf("btrfs.ReadNode: node@%d: %w", addr, ErrNotANode)
+ return nil, fmt.Errorf("btrfs.ReadNode: node@%v: %w", addr, ErrNotANode)
}
stored := nodeRef.Data.Head.Checksum
calced := CRC32c(nodeBuf[binstruct.StaticSize(CSum{}):])
if stored != calced {
- return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%d: looks like a node but is corrupt: checksum mismatch: stored=%s calculated=%s",
+ return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%v: looks like a node but is corrupt: checksum mismatch: stored=%v calculated=%v",
addr, stored, calced)
}
if laddrCB != nil {
if err := laddrCB(nodeRef.Data.Head.Addr); err != nil {
- return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%d: %w", addr, err)
+ return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%v: %w", addr, err)
}
}
// parse (main)
if _, err := nodeRef.Data.UnmarshalBinary(nodeBuf); err != nil {
- return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%d: %w", addr, err)
+ return nodeRef, fmt.Errorf("btrfs.ReadNode: node@%v: %w", addr, err)
}
// return
@@ -374,7 +374,7 @@ func (fs *FS) ReadNode(addr LogicalAddr) (*util.Ref[LogicalAddr, Node], error) {
return ReadNode[LogicalAddr](fs, sb.Data, addr, func(claimAddr LogicalAddr) error {
if claimAddr != addr {
- return fmt.Errorf("read from laddr=%d but claims to be at laddr=%d",
+ return fmt.Errorf("read from laddr=%v but claims to be at laddr=%v",
addr, claimAddr)
}
return nil
diff --git a/pkg/btrfs/types_superblock.go b/pkg/btrfs/types_superblock.go
index 7291869..0f63389 100644
--- a/pkg/btrfs/types_superblock.go
+++ b/pkg/btrfs/types_superblock.go
@@ -84,7 +84,7 @@ func (sb Superblock) ValidateChecksum() error {
return err
}
if calced != stored {
- return fmt.Errorf("superblock checksum mismatch: stored=%s calculated=%s",
+ return fmt.Errorf("superblock checksum mismatch: stored=%v calculated=%v",
stored, calced)
}
return nil
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2025-03-18 20:33:36 +0000