pkg/system.EnsureRemoveAll: don't call Mounted

kolyshkin · kolyshkin · commit f8dbc31b78ee · 2020-03-09T13:08:57.000-07:00
1. Call to mount.Mounted() is very expensive and it's redundant
   to call it before Unmount().

2. Calling mount.Mounted() after an error from Unmount() is
   questionable -- if umount failed, the mount is probably
   still there anyway, it doesn't make sense to check it.

This should result in faster code with no change in functionality.

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/pkg/system/rm.go b/pkg/system/rm.go
@@ -63,12 +63,8 @@ func EnsureRemoveAll(dir string) error {
 			return err
 		}
 
-		if mounted, _ := mount.Mounted(pe.Path); mounted {
-			if e := mount.Unmount(pe.Path); e != nil {
-				if mounted, _ := mount.Mounted(pe.Path); mounted {
-					return errors.Wrapf(e, "error while removing %s", dir)
-				}
-			}
+		if e := mount.Unmount(pe.Path); e != nil {
+			return errors.Wrapf(e, "error while removing %s", dir)
 		}
 
 		if exitOnErr[pe.Path] == maxRetry {

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,8 @@ func EnsureRemoveAll(dir string) error {`
`63`	`63`	`return err`
`64`	`64`	`}`
`65`	`65`
`66`		`- if mounted, _ := mount.Mounted(pe.Path); mounted {`
`67`		`- if e := mount.Unmount(pe.Path); e != nil {`
`68`		`- if mounted, _ := mount.Mounted(pe.Path); mounted {`
`69`		`- return errors.Wrapf(e, "error while removing %s", dir)`
`70`		`- }`
`71`		`- }`
	`66`	`+ if e := mount.Unmount(pe.Path); e != nil {`
	`67`	`+ return errors.Wrapf(e, "error while removing %s", dir)`
`72`	`68`	`}`
`73`	`69`
`74`	`70`	`if exitOnErr[pe.Path] == maxRetry {`