Merge pull request containerd#9805 from UiPath/use-sys-for-loop-configure

go.mod: Bump golang.org/x/sys to v0.17.0

Author: dmcgowan

core/mount/losetup_linux.go

@@ -21,9 +21,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"syscall"
 	"time"
-	"unsafe"
 
 	"github.com/containerd/containerd/v2/internal/randutil"
 	kernel "github.com/containerd/containerd/v2/pkg/kernelversion"
@@ -35,8 +33,6 @@ const (
 	loopDevFormat   = "/dev/loop%d"
 
 	ebusyString = "device or resource busy"
-
-	loopConfigureIoctl = 0x4c0a
 )
 
 type LoopConfig struct {
@@ -46,15 +42,6 @@ type LoopConfig struct {
 	Reserved  [8]uint64
 }
 
-func ioctlConfigure(fd int, value *LoopConfig) error {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(fd), uintptr(loopConfigureIoctl), uintptr(unsafe.Pointer(value)))
-	if err == 0 {
-		return nil
-	}
-
-	return err
-}
-
 // LoopParams parameters to control loop device setup
 type LoopParams struct {
 	// Loop device should forbid write
@@ -107,7 +94,7 @@ func setupLoopDev(backingFile, loopDev string, param LoopParams) (_ *os.File, re
 
 	fiveDotEight := kernel.KernelVersion{Kernel: 5, Major: 8}
 	if ok, err := kernel.GreaterEqualThan(fiveDotEight); err == nil && ok {
-		config := LoopConfig{
+		config := unix.LoopConfig{
 			Fd: uint32(back.Fd()),
 		}
 
@@ -124,7 +111,7 @@ func setupLoopDev(backingFile, loopDev string, param LoopParams) (_ *os.File, re
 			config.Info.Flags |= unix.LO_FLAGS_DIRECT_IO
 		}
 
-		if err := ioctlConfigure(int(loop.Fd()), &config); err != nil {
+		if err := unix.IoctlLoopConfigure(int(loop.Fd()), &config); err != nil {
 			return nil, fmt.Errorf("failed to configure loop device: %s: %w", loopDev, err)
 		}
 

go.mod

@@ -67,7 +67,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.23.1
 	golang.org/x/mod v0.14.0
 	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.16.0
+	golang.org/x/sys v0.17.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917
 	google.golang.org/grpc v1.61.0
 	google.golang.org/protobuf v1.32.0

go.sum

@@ -451,8 +451,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=