浏览代码

Merge pull request #39801 from kolyshkin/loopback-idx

Use correct `LOOP_CTL_GET_FREE` API in `pkg/loopback`
Sebastiaan van Stijn 5 年之前
父节点
当前提交
339dd0a2e5
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      pkg/loopback/ioctl.go

+ 7 - 3
pkg/loopback/ioctl.go

@@ -9,11 +9,15 @@ import (
 )
 
 func ioctlLoopCtlGetFree(fd uintptr) (int, error) {
-	index, err := unix.IoctlGetInt(int(fd), LoopCtlGetFree)
-	if err != nil {
+	// The ioctl interface for /dev/loop-control (since Linux 3.1) is a bit
+	// off compared to what you'd expect: instead of writing an integer to a
+	// parameter pointer like unix.IoctlGetInt() expects, it returns the first
+	// available loop device index directly.
+	ioctlReturn, _, err := unix.Syscall(unix.SYS_IOCTL, fd, LoopCtlGetFree, 0)
+	if err != 0 {
 		return 0, err
 	}
-	return index, nil
+	return int(ioctlReturn), nil
 }
 
 func ioctlLoopSetFd(loopFd, sparseFd uintptr) error {