From 6d8329d7f57677bcc323ed155d03e3d1cb196742 Mon Sep 17 00:00:00 2001 From: Jin Dong Date: Mon, 21 Aug 2023 19:03:41 -0700 Subject: [PATCH] Remove unnecessary joinError unwrap Signed-off-by: Jin Dong --- snapshots/devmapper/pool_device.go | 15 +-------------- snapshots/storage/metastore.go | 5 ----- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go index 20117d1c3..b69489faa 100644 --- a/snapshots/devmapper/pool_device.go +++ b/snapshots/devmapper/pool_device.go @@ -209,20 +209,7 @@ func (p *PoolDevice) transition(ctx context.Context, deviceName string, tryingSt result = append(result, uerr) } - return unwrapError(errors.Join(result...)) -} - -func unwrapError(e error) error { - if e == nil { - return nil - } - - if joinErr, ok := e.(interface{ Unwrap() []error }); ok { - if errs := joinErr.Unwrap(); len(errs) == 1 { - return errs[0] - } - } - return e + return errors.Join(result...) } // CreateThinDevice creates new devmapper thin-device with given name and size. diff --git a/snapshots/storage/metastore.go b/snapshots/storage/metastore.go index f4623b877..c0261731c 100644 --- a/snapshots/storage/metastore.go +++ b/snapshots/storage/metastore.go @@ -140,11 +140,6 @@ func (ms *MetaStore) WithTransaction(ctx context.Context, writable bool, fn Tran if err := errors.Join(result...); err != nil { log.G(ctx).WithError(err).Debug("snapshotter error") - - // Unwrap if just one error - if errs, ok := err.(interface{ Unwrap() []error }); ok && len(errs.Unwrap()) == 1 { - return errs.Unwrap()[0] - } return err }