@@ -291,7 +291,7 @@ func (s *snapshotter) Mounts(ctx context.Context, key string) (snapshot.Mountabl

 					return nil, nil, err

 				}

 				return []mount.Mount{{

-						Source:  string(rootfs),

+						Source:  rootfs,

 						Type:    "bind",

 						Options: []string{"rbind"},

 					}}, func() error {

@@ -312,7 +312,7 @@ func (s *snapshotter) Mounts(ctx context.Context, key string) (snapshot.Mountabl

 				return nil, nil, err

 			}

 			return []mount.Mount{{

-					Source:  string(rootfs),

+					Source:  rootfs,

 					Type:    "bind",

 					Options: []string{"rbind"},

 				}}, func() error {

@@ -45,7 +45,7 @@ type copyInfo struct {

 }

 func (c copyInfo) fullPath() (string, error) {

-	return containerfs.ResolveScopedPath(string(c.root), c.path)

+	return containerfs.ResolveScopedPath(c.root, c.path)

 }

 func newCopyInfoFromSource(source builder.Source, path string, hash string) copyInfo {

@@ -159,7 +159,7 @@ func (o *copier) getCopyInfoForSourcePath(orig, dest string) ([]copyInfo, error)

 		}

 		path = unnamedFilename

 	}

-	o.tmpPaths = append(o.tmpPaths, string(remote.Root()))

+	o.tmpPaths = append(o.tmpPaths, remote.Root())

 	hash, err := remote.Hash(path)

 	ci := newCopyInfoFromSource(remote, path, hash)

@@ -202,7 +202,7 @@ func (o *copier) calcCopyInfo(origPath string, allowWildcards bool) ([]copyInfo,

 		o.source, err = remotecontext.NewLazySource(rwLayer.Root())

 		if err != nil {

-			return nil, errors.Wrapf(err, "failed to create context for copy from %s", string(rwLayer.Root()))

+			return nil, errors.Wrapf(err, "failed to create context for copy from %s", rwLayer.Root())

 		}

 	}

@@ -259,7 +259,7 @@ func (o *copier) storeInPathCache(im *imageMount, path string, hash string) {

 func (o *copier) copyWithWildcards(origPath string) ([]copyInfo, error) {

 	root := o.source.Root()

 	var copyInfos []copyInfo

-	if err := filepath.Walk(string(root), func(path string, info os.FileInfo, err error) error {

+	if err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {

 		if err != nil {

 			return err

 		}

@@ -442,7 +442,7 @@ func downloadSource(output io.Writer, stdout io.Writer, srcURL string) (remote b

 		return

 	}

-	lc, err := remotecontext.NewLazySource(containerfs.NewLocalContainerFS(tmpDir))

+	lc, err := remotecontext.NewLazySource(tmpDir)

 	return lc, filename, err

 }

@@ -147,7 +147,7 @@ func (b *Builder) performCopy(req dispatchRequest, inst copyInstruction) error {

 	// translated (if necessary because of user namespaces), and replace

 	// the root pair with the chown pair for copy operations

 	if inst.chownStr != "" {

-		identity, err = parseChownFlag(b, state, inst.chownStr, string(destInfo.root), b.idMapping)

+		identity, err = parseChownFlag(b, state, inst.chownStr, destInfo.root, b.idMapping)

 		if err != nil {

 			if b.options.Platform != "windows" {

 				return errors.Wrapf(err, "unable to convert uid/gid chown string to host mapping")

@@ -20,7 +20,7 @@ type archiveContext struct {

 }

 func (c *archiveContext) Close() error {

-	return os.RemoveAll(string(c.root))

+	return os.RemoveAll(c.root)

 }

 func convertPathError(err error, cleanpath string) error {

@@ -53,7 +53,7 @@ func FromArchive(tarStream io.Reader) (builder.Source, error) {

 	}

 	// Assume local file system. Since it's coming from a tar file.

-	tsc := &archiveContext{root: containerfs.NewLocalContainerFS(root)}

+	tsc := &archiveContext{root: root}

 	// Make sure we clean-up upon error.  In the happy case the caller

 	// is expected to manage the clean-up

@@ -100,7 +100,7 @@ func (c *archiveContext) Hash(path string) (string, error) {

 		return "", err

 	}

-	rel, err := filepath.Rel(string(c.root), fullpath)

+	rel, err := filepath.Rel(c.root, fullpath)

 	if err != nil {

 		return "", convertPathError(err, cleanpath)

 	}

@@ -117,7 +117,7 @@ func (c *archiveContext) Hash(path string) (string, error) {

 func normalize(path string, root containerfs.ContainerFS) (cleanPath, fullPath string, err error) {

 	cleanPath = filepath.Clean(string(filepath.Separator) + path)[1:]

-	fullPath, err = containerfs.ResolveScopedPath(string(root), path)

+	fullPath, err = containerfs.ResolveScopedPath(root, path)

 	if err != nil {

 		return "", "", errors.Wrapf(err, "forbidden path outside the build context: %s (%s)", path, cleanPath)

 	}

@@ -176,7 +176,7 @@ func StatAt(remote builder.Source, path string) (os.FileInfo, error) {

 // FullPath is a helper for getting a full path for a path from a source

 func FullPath(remote builder.Source, path string) (string, error) {

-	fullPath, err := containerfs.ResolveScopedPath(string(remote.Root()), path)

+	fullPath, err := containerfs.ResolveScopedPath(remote.Root(), path)

 	if err != nil {

 		if runtime.GOOS == "windows" {

 			return "", fmt.Errorf("failed to resolve scoped path %s (%s): %s. Possible cause is a forbidden path outside the build context", path, fullPath, err)

@@ -53,7 +53,7 @@ func checkDirectory(t *testing.T, dir string, expectedFiles []string) {

 }

 func executeProcess(t *testing.T, contextDir string) {

-	modifiableCtx := &stubRemote{root: containerfs.NewLocalContainerFS(contextDir)}

+	modifiableCtx := &stubRemote{root: contextDir}

 	err := removeDockerfile(modifiableCtx, builder.DefaultDockerfileName)

@@ -119,5 +119,5 @@ func (r *stubRemote) Close() error {

 	return errors.New("not implemented")

 }

 func (r *stubRemote) Remove(p string) error {

-	return os.Remove(filepath.Join(string(r.root), p))

+	return os.Remove(filepath.Join(r.root, p))

 }

@@ -66,7 +66,7 @@ func (c *lazySource) Hash(path string) (string, error) {

 }

 func (c *lazySource) prepareHash(relPath string, fi os.FileInfo) (string, error) {

-	p := filepath.Join(string(c.root), relPath)

+	p := filepath.Join(c.root, relPath)

 	h, err := NewFileHash(p, relPath, fi)

 	if err != nil {

 		return "", errors.Wrapf(err, "failed to create hash for %s", relPath)

@@ -91,7 +91,7 @@ func (c *lazySource) prepareHash(relPath string, fi os.FileInfo) (string, error)

 func Rel(basepath containerfs.ContainerFS, targpath string) (string, error) {

 	// filepath.Rel can't handle UUID paths in windows

 	if runtime.GOOS == "windows" {

-		pfx := string(basepath) + `\`

+		pfx := basepath + `\`

 		if strings.HasPrefix(targpath, pfx) {

 			p := strings.TrimPrefix(targpath, pfx)

 			if p == "" {

@@ -100,5 +100,5 @@ func Rel(basepath containerfs.ContainerFS, targpath string) (string, error) {

 			return p, nil

 		}

 	}

-	return filepath.Rel(string(basepath), targpath)

+	return filepath.Rel(basepath, targpath)

 }

@@ -28,7 +28,7 @@ type CachableSource struct {

 func NewCachableSource(root string) *CachableSource {

 	ts := &CachableSource{

 		tree: iradix.New(),

-		root: containerfs.NewLocalContainerFS(root),

+		root: root,

 	}

 	return ts

 }

@@ -67,7 +67,7 @@ func (cs *CachableSource) Scan() error {

 		return err

 	}

 	txn := iradix.New().Txn()

-	err = filepath.Walk(string(cs.root), func(path string, info os.FileInfo, err error) error {

+	err = filepath.Walk(cs.root, func(path string, info os.FileInfo, err error) error {

 		if err != nil {

 			return errors.Wrapf(err, "failed to walk %s", path)

 		}

@@ -35,7 +35,7 @@ func TestCloseRootDirectory(t *testing.T) {

 		t.Fatalf("Error while executing Close: %s", err)

 	}

-	_, err = os.Stat(string(src.Root()))

+	_, err = os.Stat(src.Root())

 	if !errors.Is(err, os.ErrNotExist) {

 		t.Fatal("Directory should not exist at this point")

@@ -118,7 +118,7 @@ func TestRemoveDirectory(t *testing.T) {

 	src := makeTestArchiveContext(t, contextDir)

-	_, err = os.Stat(filepath.Join(string(src.Root()), relativePath))

+	_, err = os.Stat(filepath.Join(src.Root(), relativePath))

 	if err != nil {

 		t.Fatalf("Statting %s shouldn't fail: %+v", relativePath, err)

 	}

@@ -129,7 +129,7 @@ func TestRemoveDirectory(t *testing.T) {

 		t.Fatalf("Error when executing Remove: %s", err)

 	}

-	_, err = os.Stat(filepath.Join(string(src.Root()), relativePath))

+	_, err = os.Stat(filepath.Join(src.Root(), relativePath))

 	if !errors.Is(err, os.ErrNotExist) {

 		t.Fatalf("Directory should not exist at this point: %+v ", err)

 	}

@@ -64,7 +64,7 @@ func (container *Container) StatPath(resolvedPath, absPath string) (stat *types.

 			return nil, err

 		}

-		linkTarget, err = filepath.Rel(string(container.BaseFS), hostPath)

+		linkTarget, err = filepath.Rel(container.BaseFS, hostPath)

 		if err != nil {

 			return nil, err

 		}

@@ -304,13 +304,13 @@ func (container *Container) GetResourcePath(path string) (string, error) {

 	}

 	// IMPORTANT - These are paths on the OS where the daemon is running, hence

 	// any filepath operations must be done in an OS agnostic way.

-	r, e := containerfs.ResolveScopedPath(string(container.BaseFS), containerfs.CleanScopedPath(path))

+	r, e := containerfs.ResolveScopedPath(container.BaseFS, containerfs.CleanScopedPath(path))

 	// Log this here on the daemon side as there's otherwise no indication apart

 	// from the error being propagated all the way back to the client. This makes

 	// debugging significantly easier and clearly indicates the error comes from the daemon.

 	if e != nil {

-		logrus.Errorf("Failed to ResolveScopedPath BaseFS %s path %s %s\n", string(container.BaseFS), path, e)

+		logrus.Errorf("Failed to ResolveScopedPath BaseFS %s path %s %s\n", container.BaseFS, path, e)

 	}

 	return r, e

 }

@@ -246,7 +246,7 @@ func (daemon *Daemon) containerArchivePath(container *container.Container, path

 	}

 	opts := archive.TarResourceRebaseOpts(sourceBase, filepath.Base(absPath))

-	data, err := archivePath(driver, sourceDir, opts, string(container.BaseFS))

+	data, err := archivePath(driver, sourceDir, opts, container.BaseFS)

 	if err != nil {

 		return nil, nil, err

 	}

@@ -333,14 +333,14 @@ func (daemon *Daemon) containerExtractToDir(container *container.Container, path

 	// a volume file path.

 	var baseRel string

 	if strings.HasPrefix(resolvedPath, `\\?\Volume{`) {

-		if strings.HasPrefix(resolvedPath, string(driver)) {

-			baseRel = resolvedPath[len(string(driver)):]

+		if strings.HasPrefix(resolvedPath, driver) {

+			baseRel = resolvedPath[len(driver):]

 			if baseRel[:1] == `\` {

 				baseRel = baseRel[1:]

 			}

 		}

 	} else {

-		baseRel, err = filepath.Rel(string(driver), resolvedPath)

+		baseRel, err = filepath.Rel(driver, resolvedPath)

 	}

 	if err != nil {

 		return err

@@ -372,7 +372,7 @@ func (daemon *Daemon) containerExtractToDir(container *container.Container, path

 		}

 	}

-	if err := extractArchive(driver, content, resolvedPath, options, string(container.BaseFS)); err != nil {

+	if err := extractArchive(driver, content, resolvedPath, options, container.BaseFS); err != nil {

 		return err

 	}

@@ -434,7 +434,7 @@ func (daemon *Daemon) containerCopy(container *container.Container, resource str

 	archv, err := archivePath(driver, basePath, &archive.TarOptions{

 		Compression:  archive.Uncompressed,

 		IncludeFiles: filter,

-	}, string(container.BaseFS))

+	}, container.BaseFS)

 	if err != nil {

 		return nil, err

 	}

@@ -61,10 +61,10 @@ func (daemon *Daemon) containerExport(container *container.Container) (arch io.R

 		return nil, err

 	}

-	archv, err := archivePath(basefs, string(basefs), &archive.TarOptions{

+	archv, err := archivePath(basefs, basefs, &archive.TarOptions{

 		Compression: archive.Uncompressed,

 		IDMap:       daemon.idMapping,

-	}, string(basefs))

+	}, basefs)

 	if err != nil {

 		rwlayer.Unmount()

 		return nil, err

@@ -370,7 +370,7 @@ func (a *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 		}

 	}

 	if count := a.ctr.Increment(m); count > 1 {

-		return containerfs.NewLocalContainerFS(m), nil

+		return m, nil

 	}

 	// If a dir does not have a parent ( no layers )do not try to mount

@@ -384,7 +384,7 @@ func (a *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 	a.pathCacheLock.Lock()

 	a.pathCache[id] = m

 	a.pathCacheLock.Unlock()

-	return containerfs.NewLocalContainerFS(m), nil

+	return m, nil

 }

 // Put unmounts and updates list of active mounts.

@@ -43,14 +43,6 @@ func testInit(dir string, t testing.TB) graphdriver.Driver {

 	return d

 }

-func driverGet(d *Driver, id string, mntLabel string) (string, error) {

-	mnt, err := d.Get(id, mntLabel)

-	if err != nil {

-		return "", err

-	}

-	return string(mnt), nil

-}

-

 func newDriver(t testing.TB) *Driver {

 	if err := os.MkdirAll(tmp, 0755); err != nil {

 		t.Fatal(err)

@@ -180,7 +172,7 @@ func TestGetWithoutParent(t *testing.T) {

 		t.Fatal(err)

 	}

 	expected := path.Join(tmp, "diff", "1")

-	if string(diffPath) != expected {

+	if diffPath != expected {

 		t.Fatalf("Expected path %s got %s", expected, diffPath)

 	}

 }

@@ -262,8 +254,8 @@ func TestMountWithParent(t *testing.T) {

 	}

 	expected := path.Join(tmp, "mnt", "2")

-	if string(mntPath) != expected {

-		t.Fatalf("Expected %s got %s", expected, string(mntPath))

+	if mntPath != expected {

+		t.Fatalf("Expected %s got %s", expected, mntPath)

 	}

 }

@@ -323,7 +315,7 @@ func TestGetDiff(t *testing.T) {

 		t.Fatal(err)

 	}

-	diffPath, err := driverGet(d, "1", "")

+	diffPath, err := d.Get("1", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -367,7 +359,7 @@ func TestChanges(t *testing.T) {

 		}

 	}()

-	mntPoint, err := driverGet(d, "2", "")

+	mntPoint, err := d.Get("2", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -406,7 +398,7 @@ func TestChanges(t *testing.T) {

 	if err := d.CreateReadWrite("3", "2", nil); err != nil {

 		t.Fatal(err)

 	}

-	mntPoint, err = driverGet(d, "3", "")

+	mntPoint, err = d.Get("3", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -452,7 +444,7 @@ func TestDiffSize(t *testing.T) {

 		t.Fatal(err)

 	}

-	diffPath, err := driverGet(d, "1", "")

+	diffPath, err := d.Get("1", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -494,7 +486,7 @@ func TestChildDiffSize(t *testing.T) {

 		t.Fatal(err)

 	}

-	diffPath, err := driverGet(d, "1", "")

+	diffPath, err := d.Get("1", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -595,7 +587,7 @@ func TestApplyDiff(t *testing.T) {

 		t.Fatal(err)

 	}

-	diffPath, err := driverGet(d, "1", "")

+	diffPath, err := d.Get("1", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -630,7 +622,7 @@ func TestApplyDiff(t *testing.T) {

 	// Ensure that the file is in the mount point for id 3

-	mountPoint, err := driverGet(d, "3", "")

+	mountPoint, err := d.Get("3", "")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -673,7 +665,7 @@ func testMountMoreThan42Layers(t *testing.T, mountPath string) {

 		err := d.CreateReadWrite(current, parent, nil)

 		assert.NilError(t, err, "current layer %d", i)

-		point, err := driverGet(d, current, "")

+		point, err := d.Get(current, "")

 		assert.NilError(t, err, "current layer %d", i)

 		f, err := os.Create(path.Join(point, current))

@@ -689,7 +681,7 @@ func testMountMoreThan42Layers(t *testing.T, mountPath string) {

 	}

 	// Perform the actual mount for the top most image

-	point, err := driverGet(d, last, "")

+	point, err := d.Get(last, "")

 	assert.NilError(t, err)

 	files, err := os.ReadDir(point)

 	assert.NilError(t, err)

@@ -649,7 +649,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 		}

 	}

-	return containerfs.NewLocalContainerFS(dir), nil

+	return dir, nil

 }

 // Put is not implemented for BTRFS as there is no cleanup required for the id.

@@ -36,14 +36,12 @@ func TestBtrfsSubvolDelete(t *testing.T) {

 	}

 	defer graphtest.PutDriver(t)

-	dirFS, err := d.Get("test", "")

+	dir, err := d.Get("test", "")

 	if err != nil {

 		t.Fatal(err)

 	}

 	defer d.Put("test")

-	dir := string(dirFS)

-

 	if err := subvolCreate(dir, "subvoltest"); err != nil {

 		t.Fatal(err)

 	}

@@ -181,7 +181,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 	mp := path.Join(d.home, "mnt", id)

 	rootFs := path.Join(mp, "rootfs")

 	if count := d.ctr.Increment(mp); count > 1 {

-		return containerfs.NewLocalContainerFS(rootFs), nil

+		return rootFs, nil

 	}

 	root := d.idMap.RootPair()

@@ -219,7 +219,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 		}

 	}

-	return containerfs.NewLocalContainerFS(rootFs), nil

+	return rootFs, nil

 }

 // Put unmounts a device and removes it.

@@ -50,7 +50,7 @@ func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err err

 	if err != nil {

 		return nil, err

 	}

-	layerFs := string(layerRootFs)

+	layerFs := layerRootFs

 	defer func() {

 		if err != nil {

@@ -70,14 +70,12 @@ func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err err

 		}), nil

 	}

-	parentRootFs, err := driver.Get(parent, "")

+	parentFs, err := driver.Get(parent, "")

 	if err != nil {

 		return nil, err

 	}

 	defer driver.Put(parent)

-	parentFs := string(parentRootFs)

-

 	changes, err := archive.ChangesDirs(layerFs, parentFs)

 	if err != nil {

 		return nil, err

@@ -106,22 +104,20 @@ func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err err

 func (gdw *NaiveDiffDriver) Changes(id, parent string) ([]archive.Change, error) {

 	driver := gdw.ProtoDriver

-	layerRootFs, err := driver.Get(id, "")

+	layerFs, err := driver.Get(id, "")

 	if err != nil {

 		return nil, err

 	}

 	defer driver.Put(id)

-	layerFs := string(layerRootFs)

 	parentFs := ""

 	if parent != "" {

-		parentRootFs, err := driver.Get(parent, "")

+		parentFs, err = driver.Get(parent, "")

 		if err != nil {

 			return nil, err

 		}

 		defer driver.Put(parent)

-		parentFs = string(parentRootFs)

 	}

 	return archive.ChangesDirs(layerFs, parentFs)

@@ -140,7 +136,7 @@ func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff io.Reader) (size i

 	}

 	defer driver.Put(id)

-	layerFs := string(layerRootFs)

+	layerFs := layerRootFs

 	options := &archive.TarOptions{IDMap: gdw.idMap}

 	start := time.Now().UTC()

 	logrus.WithField("id", id).Debug("Start untar layer")

@@ -169,5 +165,5 @@ func (gdw *NaiveDiffDriver) DiffSize(id, parent string) (size int64, err error)

 	}

 	defer driver.Put(id)

-	return archive.ChangesSize(string(layerFs), changes), nil

+	return archive.ChangesSize(layerFs, changes), nil

 }

@@ -316,14 +316,14 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e

 	if err != nil {

 		// If no lower, just return diff directory

 		if os.IsNotExist(err) {

-			return containerfs.NewLocalContainerFS(diffDir), nil

+			return diffDir, nil

 		}

 		return "", err

 	}

 	mergedDir := path.Join(dir, mergedDirName)

 	if count := d.ctr.Increment(mergedDir); count > 1 {

-		return containerfs.NewLocalContainerFS(mergedDir), nil

+		return mergedDir, nil

 	}

 	defer func() {

 		if retErr != nil {

@@ -380,7 +380,7 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e

 		return "", errors.Wrapf(err, "using mount program %s: %s", binary, output)

 	}

-	return containerfs.NewLocalContainerFS(mergedDir), nil

+	return mergedDir, nil

 }

 // Put unmounts the mount path created for the give id.

@@ -250,7 +250,7 @@ func DriverBenchDeepLayerRead(b *testing.B, layerCount int, drivername string, d

 	for i := 0; i < b.N; i++ {

 		// Read content

-		c, err := os.ReadFile(filepath.Join(string(root), "testfile.txt"))

+		c, err := os.ReadFile(filepath.Join(root, "testfile.txt"))

 		if err != nil {

 			b.Fatal(err)

 		}

@@ -96,10 +96,10 @@ func DriverTestCreateEmpty(t testing.TB, drivername string, driverOptions ...str

 	dir, err := driver.Get("empty", "")

 	assert.NilError(t, err)

-	verifyFile(t, string(dir), 0755|os.ModeDir, 0, 0)

+	verifyFile(t, dir, 0755|os.ModeDir, 0, 0)

 	// Verify that the directory is empty

-	fis, err := readDir(string(dir))

+	fis, err := readDir(dir)

 	assert.NilError(t, err)

 	assert.Check(t, is.Len(fis, 0))

@@ -324,19 +324,19 @@ func DriverTestSetQuota(t *testing.T, drivername string, required bool) {

 	quota := uint64(50 * units.MiB)

 	// Try to write a file smaller than quota, and ensure it works

-	err = writeRandomFile(path.Join(string(mountPath), "smallfile"), quota/2)

+	err = writeRandomFile(path.Join(mountPath, "smallfile"), quota/2)

 	if err != nil {

 		t.Fatal(err)

 	}

-	defer os.Remove(path.Join(string(mountPath), "smallfile"))

+	defer os.Remove(path.Join(mountPath, "smallfile"))

 	// Try to write a file bigger than quota. We've already filled up half the quota, so hitting the limit should be easy

-	err = writeRandomFile(path.Join(string(mountPath), "bigfile"), quota)

+	err = writeRandomFile(path.Join(mountPath, "bigfile"), quota)

 	if err == nil {

 		t.Fatalf("expected write to fail(), instead had success")

 	}

 	if pathError, ok := err.(*os.PathError); ok && pathError.Err != unix.EDQUOT && pathError.Err != unix.ENOSPC {

-		os.Remove(path.Join(string(mountPath), "bigfile"))

+		os.Remove(path.Join(mountPath, "bigfile"))

 		t.Fatalf("expect write() to fail with %v or %v, got %v", unix.EDQUOT, unix.ENOSPC, pathError.Err)

 	}

 }

@@ -36,17 +36,17 @@ func addFiles(drv graphdriver.Driver, layer string, seed int64) error {

 	}

 	defer drv.Put(layer)

-	if err := os.WriteFile(filepath.Join(string(root), "file-a"), randomContent(64, seed), 0755); err != nil {

+	if err := os.WriteFile(filepath.Join(root, "file-a"), randomContent(64, seed), 0755); err != nil {

 		return err

 	}

-	if err := os.MkdirAll(filepath.Join(string(root), "dir-b"), 0755); err != nil {

+	if err := os.MkdirAll(filepath.Join(root, "dir-b"), 0755); err != nil {

 		return err

 	}

-	if err := os.WriteFile(filepath.Join(string(root), "dir-b", "file-b"), randomContent(128, seed+1), 0755); err != nil {

+	if err := os.WriteFile(filepath.Join(root, "dir-b", "file-b"), randomContent(128, seed+1), 0755); err != nil {

 		return err

 	}

-	return os.WriteFile(filepath.Join(string(root), "file-c"), randomContent(128*128, seed+2), 0755)

+	return os.WriteFile(filepath.Join(root, "file-c"), randomContent(128*128, seed+2), 0755)

 }

 func checkFile(drv graphdriver.Driver, layer, filename string, content []byte) error {

@@ -56,7 +56,7 @@ func checkFile(drv graphdriver.Driver, layer, filename string, content []byte) e

 	}

 	defer drv.Put(layer)

-	fileContent, err := os.ReadFile(filepath.Join(string(root), filename))

+	fileContent, err := os.ReadFile(filepath.Join(root, filename))

 	if err != nil {

 		return err

 	}

@@ -75,7 +75,7 @@ func addFile(drv graphdriver.Driver, layer, filename string, content []byte) err

 	}

 	defer drv.Put(layer)

-	return os.WriteFile(filepath.Join(string(root), filename), content, 0755)

+	return os.WriteFile(filepath.Join(root, filename), content, 0755)

 }

 func addDirectory(drv graphdriver.Driver, layer, dir string) error {

@@ -85,7 +85,7 @@ func addDirectory(drv graphdriver.Driver, layer, dir string) error {

 	}

 	defer drv.Put(layer)

-	return os.MkdirAll(filepath.Join(string(root), dir), 0755)

+	return os.MkdirAll(filepath.Join(root, dir), 0755)

 }

 func removeAll(drv graphdriver.Driver, layer string, names ...string) error {

@@ -96,7 +96,7 @@ func removeAll(drv graphdriver.Driver, layer string, names ...string) error {

 	defer drv.Put(layer)

 	for _, filename := range names {

-		if err := os.RemoveAll(filepath.Join(string(root), filename)); err != nil {

+		if err := os.RemoveAll(filepath.Join(root, filename)); err != nil {

 			return err

 		}

 	}

@@ -110,8 +110,8 @@ func checkFileRemoved(drv graphdriver.Driver, layer, filename string) error {

 	}

 	defer drv.Put(layer)

-	if _, err := os.Stat(filepath.Join(string(root), filename)); err == nil {

-		return fmt.Errorf("file still exists: %s", filepath.Join(string(root), filename))

+	if _, err := os.Stat(filepath.Join(root, filename)); err == nil {

+		return fmt.Errorf("file still exists: %s", filepath.Join(root, filename))

 	} else if !os.IsNotExist(err) {

 		return err

 	}

@@ -127,7 +127,7 @@ func addManyFiles(drv graphdriver.Driver, layer string, count int, seed int64) e

 	defer drv.Put(layer)

 	for i := 0; i < count; i += 100 {

-		dir := filepath.Join(string(root), fmt.Sprintf("directory-%d", i))

+		dir := filepath.Join(root, fmt.Sprintf("directory-%d", i))

 		if err := os.MkdirAll(dir, 0755); err != nil {

 			return err

 		}

@@ -152,7 +152,7 @@ func changeManyFiles(drv graphdriver.Driver, layer string, count int, seed int64

 	var changes []archive.Change

 	for i := 0; i < count; i += 100 {

 		archiveRoot := fmt.Sprintf("/directory-%d", i)

-		if err := os.MkdirAll(filepath.Join(string(root), archiveRoot), 0755); err != nil {

+		if err := os.MkdirAll(filepath.Join(root, archiveRoot), 0755); err != nil {

 			return nil, err

 		}

 		for j := 0; i+j < count && j < 100; j++ {

@@ -168,21 +168,21 @@ func changeManyFiles(drv graphdriver.Driver, layer string, count int, seed int64

 			case 0:

 				change.Path = filepath.Join(archiveRoot, fmt.Sprintf("file-%d", i+j))

 				change.Kind = archive.ChangeModify

-				if err := os.WriteFile(filepath.Join(string(root), change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {

+				if err := os.WriteFile(filepath.Join(root, change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {

 					return nil, err

 				}

 			// Add file

 			case 1:

 				change.Path = filepath.Join(archiveRoot, fmt.Sprintf("file-%d-%d", seed, i+j))

 				change.Kind = archive.ChangeAdd

-				if err := os.WriteFile(filepath.Join(string(root), change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {

+				if err := os.WriteFile(filepath.Join(root, change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {

 					return nil, err

 				}

 			// Remove file

 			case 2:

 				change.Path = filepath.Join(archiveRoot, fmt.Sprintf("file-%d", i+j))

 				change.Kind = archive.ChangeDelete

-				if err := os.Remove(filepath.Join(string(root), change.Path)); err != nil {

+				if err := os.Remove(filepath.Join(root, change.Path)); err != nil {

 					return nil, err

 				}

 			}

@@ -201,7 +201,7 @@ func checkManyFiles(drv graphdriver.Driver, layer string, count int, seed int64)

 	defer drv.Put(layer)

 	for i := 0; i < count; i += 100 {

-		dir := filepath.Join(string(root), fmt.Sprintf("directory-%d", i))

+		dir := filepath.Join(root, fmt.Sprintf("directory-%d", i))

 		for j := 0; i+j < count && j < 100; j++ {

 			file := filepath.Join(dir, fmt.Sprintf("file-%d", i+j))

 			fileContent, err := os.ReadFile(file)

@@ -254,10 +254,10 @@ func addLayerFiles(drv graphdriver.Driver, layer, parent string, i int) error {

 	}

 	defer drv.Put(layer)

-	if err := os.WriteFile(filepath.Join(string(root), "top-id"), []byte(layer), 0755); err != nil {

+	if err := os.WriteFile(filepath.Join(root, "top-id"), []byte(layer), 0755); err != nil {

 		return err

 	}

-	layerDir := filepath.Join(string(root), fmt.Sprintf("layer-%d", i))

+	layerDir := filepath.Join(root, fmt.Sprintf("layer-%d", i))

 	if err := os.MkdirAll(layerDir, 0755); err != nil {

 		return err

 	}

@@ -291,7 +291,7 @@ func checkManyLayers(drv graphdriver.Driver, layer string, count int) error {

 	}

 	defer drv.Put(layer)

-	layerIDBytes, err := os.ReadFile(filepath.Join(string(root), "top-id"))

+	layerIDBytes, err := os.ReadFile(filepath.Join(root, "top-id"))

 	if err != nil {

 		return err

 	}

@@ -301,7 +301,7 @@ func checkManyLayers(drv graphdriver.Driver, layer string, count int) error {

 	}

 	for i := count; i > 0; i-- {

-		layerDir := filepath.Join(string(root), fmt.Sprintf("layer-%d", i))

+		layerDir := filepath.Join(root, fmt.Sprintf("layer-%d", i))

 		thisLayerIDBytes, err := os.ReadFile(filepath.Join(layerDir, "layer-id"))

 		if err != nil {

@@ -45,11 +45,11 @@ func createBase(t testing.TB, driver graphdriver.Driver, name string) {

 	assert.NilError(t, err)

 	defer driver.Put(name)

-	subdir := filepath.Join(string(dirFS), "a subdir")

+	subdir := filepath.Join(dirFS, "a subdir")

 	assert.NilError(t, os.Mkdir(subdir, 0705|os.ModeSticky))

 	assert.NilError(t, contdriver.LocalDriver.Lchown(subdir, 1, 2))

-	file := filepath.Join(string(dirFS), "a file")

+	file := filepath.Join(dirFS, "a file")

 	err = os.WriteFile(file, []byte("Some data"), 0222|os.ModeSetuid)

 	assert.NilError(t, err)

 }

@@ -59,13 +59,13 @@ func verifyBase(t testing.TB, driver graphdriver.Driver, name string) {

 	assert.NilError(t, err)

 	defer driver.Put(name)

-	subdir := filepath.Join(string(dirFS), "a subdir")

+	subdir := filepath.Join(dirFS, "a subdir")

 	verifyFile(t, subdir, 0705|os.ModeDir|os.ModeSticky, 1, 2)

-	file := filepath.Join(string(dirFS), "a file")

+	file := filepath.Join(dirFS, "a file")

 	verifyFile(t, file, 0222|os.ModeSetuid, 0, 0)

-	files, err := readDir(string(dirFS))

+	files, err := readDir(dirFS)

 	assert.NilError(t, err)

 	assert.Check(t, is.Len(files, 2))

 }

@@ -349,12 +349,12 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, err erro

 	// If id has a root, just return it

 	rootDir := path.Join(dir, "root")

 	if _, err := os.Stat(rootDir); err == nil {

-		return containerfs.NewLocalContainerFS(rootDir), nil

+		return rootDir, nil

 	}

 	mergedDir := path.Join(dir, "merged")

 	if count := d.ctr.Increment(mergedDir); count > 1 {

-		return containerfs.NewLocalContainerFS(mergedDir), nil

+		return mergedDir, nil

 	}

 	defer func() {

 		if err != nil {

@@ -391,7 +391,7 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, err erro

 	if err := root.Chown(path.Join(workDir, "work")); err != nil {

 		return "", err

 	}

-	return containerfs.NewLocalContainerFS(mergedDir), nil

+	return mergedDir, nil

 }

 // Put unmounts the mount path created for the give id.

@@ -526,14 +526,14 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e

 	if err != nil {

 		// If no lower, just return diff directory

 		if os.IsNotExist(err) {

-			return containerfs.NewLocalContainerFS(diffDir), nil

+			return diffDir, nil

 		}

 		return "", err

 	}

 	mergedDir := path.Join(dir, mergedDirName)

 	if count := d.ctr.Increment(mergedDir); count > 1 {

-		return containerfs.NewLocalContainerFS(mergedDir), nil

+		return mergedDir, nil

 	}

 	defer func() {

 		if retErr != nil {

@@ -613,7 +613,7 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e

 		}

 	}

-	return containerfs.NewLocalContainerFS(mergedDir), nil

+	return mergedDir, nil

 }

 // Put unmounts the mount path created for the give id.

@@ -141,7 +141,7 @@ func (d *graphDriverProxy) Get(id, mountLabel string) (containerfs.ContainerFS,

 	if ret.Err != "" {

 		err = errors.New(ret.Err)

 	}

-	return containerfs.NewLocalContainerFS(d.p.ScopedPath(ret.Dir)), err

+	return d.p.ScopedPath(ret.Dir), err

 }

 func (d *graphDriverProxy) Put(id string) error {

@@ -172,7 +172,7 @@ func (d *Driver) create(id, parent string, size uint64) error {

 	if err != nil {

 		return fmt.Errorf("%s: %s", parent, err)

 	}

-	return CopyDir(string(parentDir), dir)

+	return CopyDir(parentDir, dir)

 }

 func (d *Driver) dir(id string) string {

@@ -192,7 +192,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {

 	} else if !st.IsDir() {

 		return "", fmt.Errorf("%s: not a directory", dir)

 	}

-	return containerfs.NewLocalContainerFS(dir), nil

+	return dir, nil