storage, overlay: drop unused return value

simplify dir2 since there are no more users of the homedir ret value.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Author: giuseppe

storage/drivers/overlay/overlay.go

@@ -816,7 +816,7 @@ func (d *Driver) Status() [][2]string {
 // Metadata returns meta data about the overlay driver such as
 // LowerDir, UpperDir, WorkDir and MergeDir used to store data.
 func (d *Driver) Metadata(id string) (map[string]string, error) {
-	dir, _, inAdditionalStore := d.dir2(id, false)
+	dir, inAdditionalStore := d.dir2(id, false)
 	if err := fileutils.Exists(dir); err != nil {
 		return nil, err
 	}
@@ -1022,7 +1022,7 @@ func (d *Driver) getLayerPermissions(parent string, uidMaps, gidMaps []idtools.I
 }
 
 func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts, readOnly bool) (retErr error) {
-	dir, _, _ := d.dir2(id, readOnly)
+	dir, _ := d.dir2(id, readOnly)
 
 	disableQuota := readOnly
 
@@ -1167,7 +1167,7 @@ func (d *Driver) getLower(parent string) (string, error) {
 }
 
 func (d *Driver) dir(id string) string {
-	p, _, _ := d.dir2(id, false)
+	p, _ := d.dir2(id, false)
 	return p
 }
 
@@ -1189,7 +1189,7 @@ func (d *Driver) homeDirForImageStore() string {
 	return d.home
 }
 
-func (d *Driver) dir2(id string, useImageStore bool) (string, string, bool) {
+func (d *Driver) dir2(id string, useImageStore bool) (string, bool) {
 	homedir := d.home
 	if useImageStore {
 		homedir = d.homeDirForImageStore()
@@ -1203,11 +1203,11 @@ func (d *Driver) dir2(id string, useImageStore bool) (string, string, bool) {
 			l := path.Join(p, d.name, layerID)
 			err = fileutils.Exists(l)
 			if err == nil {
-				return filepath.Join(l, suffix), homedir, true
+				return filepath.Join(l, suffix), true
 			}
 		}
 	}
-	return filepath.Join(newpath, suffix), homedir, false
+	return filepath.Join(newpath, suffix), false
 }
 
 func (d *Driver) getLowerDirs(id string) ([]string, error) {
@@ -1341,7 +1341,7 @@ func (d *Driver) Get(id string, options graphdriver.MountOpts) (string, error) {
 }
 
 func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountOpts) (_ string, retErr error) {
-	dir, _, inAdditionalStore := d.dir2(id, false)
+	dir, inAdditionalStore := d.dir2(id, false)
 	if err := fileutils.Exists(dir); err != nil {
 		return "", err
 	}
@@ -1793,7 +1793,7 @@ func (d *Driver) getMergedDir(id, dir string, inAdditionalStore bool) string {
 
 // Put unmounts the mount path created for the give id.
 func (d *Driver) Put(id string) error {
-	dir, _, inAdditionalStore := d.dir2(id, false)
+	dir, inAdditionalStore := d.dir2(id, false)
 	if err := fileutils.Exists(dir); err != nil {
 		return err
 	}
@@ -2711,7 +2711,7 @@ func getMappedMountRoot(path string) string {
 func (d *Driver) Dedup(req graphdriver.DedupArgs) (graphdriver.DedupResult, error) {
 	var dirs []string
 	for _, layer := range req.Layers {
-		dir, _, inAdditionalStore := d.dir2(layer, false)
+		dir, inAdditionalStore := d.dir2(layer, false)
 		if inAdditionalStore {
 			continue
 		}