Преглед изворни кода

Merge pull request #17378 from Microsoft/10662-unmountwithsyscall

Windows: Volumes PR rename UnmountWithSyscall
David Calavera пре 9 година
родитељ
комит
4cbe227db8
3 измењених фајлова са 5 додато и 5 уклоњено
  1. 1 1
      daemon/container.go
  2. 2 2
      pkg/system/syscall_unix.go
  3. 2 2
      pkg/system/syscall_windows.go

+ 1 - 1
daemon/container.go

@@ -1172,7 +1172,7 @@ func (container *Container) unmountVolumes(forceSyscall bool) error {
 
 
 	for _, volumeMount := range volumeMounts {
 	for _, volumeMount := range volumeMounts {
 		if forceSyscall {
 		if forceSyscall {
-			system.UnmountWithSyscall(volumeMount.Destination)
+			system.Unmount(volumeMount.Destination)
 		}
 		}
 
 
 		if volumeMount.Volume != nil {
 		if volumeMount.Volume != nil {

+ 2 - 2
pkg/system/syscall_unix.go

@@ -4,8 +4,8 @@ package system
 
 
 import "syscall"
 import "syscall"
 
 
-// UnmountWithSyscall is a platform-specific helper function to call
+// Unmount is a platform-specific helper function to call
 // the unmount syscall.
 // the unmount syscall.
-func UnmountWithSyscall(dest string) {
+func Unmount(dest string) {
 	syscall.Unmount(dest, 0)
 	syscall.Unmount(dest, 0)
 }
 }

+ 2 - 2
pkg/system/syscall_windows.go

@@ -1,6 +1,6 @@
 package system
 package system
 
 
-// UnmountWithSyscall is a platform-specific helper function to call
+// Unmount is a platform-specific helper function to call
 // the unmount syscall. Not supported on Windows
 // the unmount syscall. Not supported on Windows
-func UnmountWithSyscall(dest string) {
+func Unmount(dest string) {
 }
 }