diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-13 23:55:59 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-14 00:50:11 -0600 |
| commit | e784de8a66c3645fdd3a54939b5b844f3bacd82d (patch) | |
| tree | 5d749f33cef81de81958d4825f92adb668f8e54f /lib/btrfsprogs | |
| parent | 5b52a894d5e0a24907ac5073841b5a0bebbd2247 (diff) | |
diskio.File: Add .Close() and don't have .Size() return an error
Diffstat (limited to 'lib/btrfsprogs')
| -rw-r--r-- | lib/btrfsprogs/btrfsinspect/recoverchunks.go | 2 | ||||
| -rw-r--r-- | lib/btrfsprogs/btrfsutil/open.go | 12 | ||||
| -rw-r--r-- | lib/btrfsprogs/btrfsutil/scan.go | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/recoverchunks.go b/lib/btrfsprogs/btrfsinspect/recoverchunks.go index 27ac85b..257a4fd 100644 --- a/lib/btrfsprogs/btrfsinspect/recoverchunks.go +++ b/lib/btrfsprogs/btrfsinspect/recoverchunks.go @@ -155,7 +155,7 @@ func ScanOneDev(ctx context.Context, dev *btrfs.Device, superblock btrfs.Superbl FoundNodes: make(map[btrfsvol.LogicalAddr][]btrfsvol.PhysicalAddr), } - devSize, _ := dev.Size() + devSize := dev.Size() lastProgress := -1 err := btrfsutil.ScanForNodes(ctx, dev, superblock, func(nodeRef *diskio.Ref[btrfsvol.PhysicalAddr, btrfs.Node], err error) { diff --git a/lib/btrfsprogs/btrfsutil/open.go b/lib/btrfsprogs/btrfsutil/open.go index c237b54..0f3b32a 100644 --- a/lib/btrfsprogs/btrfsutil/open.go +++ b/lib/btrfsprogs/btrfsutil/open.go @@ -12,18 +12,26 @@ import ( "github.com/datawire/dlib/dlog" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" + "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" + "git.lukeshu.com/btrfs-progs-ng/lib/diskio" ) func Open(ctx context.Context, flag int, filenames ...string) (*btrfs.FS, error) { fs := new(btrfs.FS) for i, filename := range filenames { dlog.Debugf(ctx, "Adding device file %d/%d %q...", i, len(filenames), filename) - fh, err := os.OpenFile(filename, flag, 0) + osFile, err := os.OpenFile(filename, flag, 0) if err != nil { _ = fs.Close() return nil, fmt.Errorf("device file %q: %w", filename, err) } - if err := fs.AddDevice(ctx, &btrfs.Device{File: fh}); err != nil { + typedFile := &diskio.OSFile[btrfsvol.PhysicalAddr]{ + File: osFile, + } + devFile := &btrfs.Device{ + File: typedFile, + } + if err := fs.AddDevice(ctx, devFile); err != nil { return nil, fmt.Errorf("device file %q: %w", filename, err) } } diff --git a/lib/btrfsprogs/btrfsutil/scan.go b/lib/btrfsprogs/btrfsutil/scan.go index dd77747..d5d3d8d 100644 --- a/lib/btrfsprogs/btrfsutil/scan.go +++ b/lib/btrfsprogs/btrfsutil/scan.go @@ -20,10 +20,7 @@ import ( // doing something itself when it finds a node, it simply calls a // callback function. func ScanForNodes(ctx context.Context, dev *btrfs.Device, sb btrfs.Superblock, fn func(*diskio.Ref[btrfsvol.PhysicalAddr, btrfs.Node], error), prog func(btrfsvol.PhysicalAddr)) error { - devSize, err := dev.Size() - if err != nil { - return err - } + devSize := dev.Size() if sb.NodeSize < sb.SectorSize { return fmt.Errorf("node_size(%v) < sector_size(%v)", |