From e784de8a66c3645fdd3a54939b5b844f3bacd82d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 13 Jul 2022 23:55:59 -0600 Subject: diskio.File: Add .Close() and don't have .Size() return an error --- lib/btrfs/io2_lv.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'lib/btrfs/io2_lv.go') diff --git a/lib/btrfs/io2_lv.go b/lib/btrfs/io2_lv.go index 47ab474..9316e27 100644 --- a/lib/btrfs/io2_lv.go +++ b/lib/btrfs/io2_lv.go @@ -57,7 +57,7 @@ func (fs *FS) Name() string { return name } -func (fs *FS) Size() (btrfsvol.LogicalAddr, error) { +func (fs *FS) Size() btrfsvol.LogicalAddr { return fs.LV.Size() } @@ -185,16 +185,7 @@ func (fs *FS) initDev(ctx context.Context, sb Superblock) error { } func (fs *FS) Close() error { - var errs derror.MultiError - for _, dev := range fs.LV.PhysicalVolumes() { - if err := dev.Close(); err != nil && err == nil { - errs = append(errs, err) - } - } - if errs != nil { - return errs - } - return nil + return fs.LV.Close() } var _ io.Closer = (*FS)(nil) -- cgit v1.2.3-2-g168b