commit d867a43fc93e4a7a41e33674e954dc459b27dddb
author Matt Layher <mdlayher@gmail.com> Mon Aug 09 18:18:34 2021 -0400
committer Matt Layher <mdlayher@gmail.com> Mon Aug 09 22:24:54 2021 +0000
tree b2990a7f041292a46081beeac0c12b9769492c56
parent b4502255bfe74b77ffdeb6ed972eeecd98d13721

unix: remove runtime.KeepAlive calls for Linux ioctl wrappers

As of CL 340915 these should no longer be necessary.

Change-Id: I644595aa0594d3bdc9b8f2c349990e0311060fd6
Reviewed-on: https://go-review.googlesource.com/c/sys/+/340951
Trust: Matt Layher <mdlayher@gmail.com>
Run-TryBot: Matt Layher <mdlayher@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

unix/ioctl_linux.go

diff --git a/unix/ioctl_linux.go b/unix/ioctl_linux.go
index d368ad2..013a060 100644
--- a/unix/ioctl_linux.go
+++ b/unix/ioctl_linux.go
@@ -5,7 +5,6 @@
 package unix
 
 import (
-	"runtime"
 	"unsafe"
 )
 
@@ -33,9 +32,7 @@
 }
 
 func IoctlSetRTCTime(fd int, value *RTCTime) error {
-	err := ioctlPtr(fd, RTC_SET_TIME, unsafe.Pointer(value))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, RTC_SET_TIME, unsafe.Pointer(value))
 }
 
 func IoctlGetRTCWkAlrm(fd int) (*RTCWkAlrm, error) {
@@ -45,9 +42,7 @@
 }
 
 func IoctlSetRTCWkAlrm(fd int, value *RTCWkAlrm) error {
-	err := ioctlPtr(fd, RTC_WKALM_SET, unsafe.Pointer(value))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, RTC_WKALM_SET, unsafe.Pointer(value))
 }
 
 // IoctlGetEthtoolDrvinfo fetches ethtool driver information for the network
@@ -62,7 +57,6 @@
 	ifrd := ifr.SetData(unsafe.Pointer(&value))
 
 	err = ioctlPtr(fd, SIOCETHTOOL, unsafe.Pointer(&ifrd))
-	runtime.KeepAlive(ifrd)
 	return &value, err
 }
 
@@ -87,9 +81,7 @@
 // range of data conveyed in value to the file associated with the file
 // descriptor destFd. See the ioctl_ficlonerange(2) man page for details.
 func IoctlFileCloneRange(destFd int, value *FileCloneRange) error {
-	err := ioctlPtr(destFd, FICLONERANGE, unsafe.Pointer(value))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(destFd, FICLONERANGE, unsafe.Pointer(value))
 }
 
 // IoctlFileClone performs an FICLONE ioctl operation to clone the entire file
@@ -158,9 +150,7 @@
 }
 
 func IoctlHIDGetDesc(fd int, value *HIDRawReportDescriptor) error {
-	err := ioctlPtr(fd, HIDIOCGRDESC, unsafe.Pointer(value))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, HIDIOCGRDESC, unsafe.Pointer(value))
 }
 
 func IoctlHIDGetRawInfo(fd int) (*HIDRawDevInfo, error) {