containerd
diff --git a/‎driver/driver.go‎
Lines changed: 4 additions & 0 deletions b/‎driver/driver.go‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎driver/driver_unix.go‎
Lines changed: 0 additions & 5 deletions b/‎driver/driver_unix.go‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎driver/driver_windows.go‎
Lines changed: 0 additions & 8 deletions b/‎driver/driver_windows.go‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎syscallx/syscall_unix.go‎
Lines changed: 0 additions & 26 deletions b/‎syscallx/syscall_unix.go‎
Lines changed: 0 additions & 26 deletions
diff --git a/‎syscallx/syscall_windows.go‎
Lines changed: 0 additions & 112 deletions b/‎syscallx/syscall_windows.go‎
Lines changed: 0 additions & 112 deletions
diff --git a/‎sysx/file_posix.go‎
Lines changed: 0 additions & 128 deletions b/‎sysx/file_posix.go‎
Lines changed: 0 additions & 128 deletions
@@ -138,6 +138,10 @@ func (d *driver) Lstat(p string) (os.FileInfo, error) {
 	return os.Lstat(p)
 }
 
+func (d *driver) Readlink(p string) (string, error) {
+	return os.Readlink(p)
+}
+
 func (d *driver) Mkdir(p string, mode os.FileMode) error {
 	return os.Mkdir(p, mode)
 }
 
@@ -131,8 +131,3 @@ func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {
 func (d *driver) DeviceInfo(fi os.FileInfo) (maj uint64, min uint64, err error) {
 	return devices.DeviceInfo(fi)
 }
-
-// Readlink was forked on Windows to fix a Golang bug, use the "os" package here
-func (d *driver) Readlink(p string) (string, error) {
-	return os.Readlink(p)
-}
@@ -24,8 +24,6 @@ package driver
 
 import (
 	"os"
-
-	"github.com/containerd/continuity/sysx"
 )
 
 func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
@@ -41,9 +39,3 @@ func (d *driver) Lchmod(path string, mode os.FileMode) (err error) {
 	// TODO: Use Window's equivalent
 	return os.Chmod(path, mode)
 }
-
-// Readlink is forked in order to support Volume paths which are used
-// in container layers.
-func (d *driver) Readlink(p string) (string, error) {
-	return sysx.Readlink(p)
-}
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ func (d *driver) Lstat(p string) (os.FileInfo, error) {`
`138`	`138`	`return os.Lstat(p)`
`139`	`139`	`}`
`140`	`140`
	`141`	`+func (d *driver) Readlink(p string) (string, error) {`
	`142`	`+ return os.Readlink(p)`
	`143`	`+}`
	`144`	`+`
`141`	`145`	`func (d *driver) Mkdir(p string, mode os.FileMode) error {`
`142`	`146`	`return os.Mkdir(p, mode)`
`143`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,3 @@ func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {`
`131`	`131`	`func (d *driver) DeviceInfo(fi os.FileInfo) (maj uint64, min uint64, err error) {`
`132`	`132`	`return devices.DeviceInfo(fi)`
`133`	`133`	`}`
`134`		`-`
`135`		`-// Readlink was forked on Windows to fix a Golang bug, use the "os" package here`
`136`		`-func (d *driver) Readlink(p string) (string, error) {`
`137`		`- return os.Readlink(p)`
`138`		`-}`