From eecf7a0840bcaf45e298034fa6734075ff03e0b9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 23 May 2022 15:48:45 +0200 Subject: [PATCH] volume/local: localVolume.mount() move errors.Wrap() While the current code is correct (as errors.Wrap() returns nil if err is nil), relying on this behavior has caused some confusion in the past, resulting in regressions. This patch makes the error-handling code slightly more idiomatic and defensive against such regressions. Signed-off-by: Sebastiaan van Stijn --- volume/local/local_unix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/volume/local/local_unix.go b/volume/local/local_unix.go index d68d76563c..fc507dc26f 100644 --- a/volume/local/local_unix.go +++ b/volume/local/local_unix.go @@ -123,13 +123,13 @@ func (v *localVolume) mount() error { mountOpts = strings.Replace(mountOpts, "addr="+addrValue, "addr="+ipAddr.String(), 1) } } - err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts) - if err != nil { + if err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts); err != nil { if password := getPassword(v.opts.MountOpts); password != "" { err = errors.New(strings.Replace(err.Error(), "password="+password, "password=********", 1)) } + return errors.Wrap(err, "failed to mount local volume") } - return errors.Wrap(err, "failed to mount local volume") + return nil } func (v *localVolume) postMount() error {