From ea1c35374e2424cbcb707a6e0de56b2c6c10e06c Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 14 Feb 2024 12:17:49 +0100
Subject: [PATCH] overlay: do not recreate "merged" dir

after the commit "overlay: replace rmdir with rename", it is safe to
assume it is never deleted.

Closes: https://github.com/containers/storage/issues/1827

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 drivers/overlay/overlay.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
index 0d8284a324..848cf5465e 100644
--- a/drivers/overlay/overlay.go
+++ b/drivers/overlay/overlay.go
@@ -1700,10 +1700,6 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO
 	}
 
 	mergedDir := path.Join(workDirBase, "merged")
-	// Create the driver merged dir
-	if err := idtools.MkdirAs(mergedDir, 0o700, rootUID, rootGID); err != nil && !os.IsExist(err) {
-		return "", err
-	}
 	if count := d.ctr.Increment(mergedDir); count > 1 {
 		return mergedDir, nil
 	}