From c875a63ffbf4287a09efa5a956270b2a3aa8e593 Mon Sep 17 00:00:00 2001
From: Artem Khramov <akhramov@pm.me>
Date: Sun, 5 Jun 2022 13:34:15 +0200
Subject: [PATCH] Bump x/sys/unix

A newer version of x/sys/unix updates the OpenBSD bindings
which makes the `int8SliceToString` helper function obsolete.

This change updates the x/sys/unix version
---
 mountinfo/go.mod                   |  2 +-
 mountinfo/go.sum                   |  2 ++
 mountinfo/mountinfo_bsd.go         |  8 ++++++++
 mountinfo/mountinfo_freebsdlike.go | 14 --------------
 mountinfo/mountinfo_openbsd.go     | 22 ----------------------
 5 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 mountinfo/mountinfo_freebsdlike.go
 delete mode 100644 mountinfo/mountinfo_openbsd.go

diff --git a/mountinfo/go.mod b/mountinfo/go.mod
index 9fd6e214..e1bcdfe7 100644
--- a/mountinfo/go.mod
+++ b/mountinfo/go.mod
@@ -2,4 +2,4 @@ module github.com/moby/sys/mountinfo
 
 go 1.16
 
-require golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
+require golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
diff --git a/mountinfo/go.sum b/mountinfo/go.sum
index 7f2d82d5..417210e2 100644
--- a/mountinfo/go.sum
+++ b/mountinfo/go.sum
@@ -1,2 +1,4 @@
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/mountinfo/mountinfo_bsd.go b/mountinfo/mountinfo_bsd.go
index 8420f58c..4dd1fd8b 100644
--- a/mountinfo/mountinfo_bsd.go
+++ b/mountinfo/mountinfo_bsd.go
@@ -54,3 +54,11 @@ func mounted(path string) (bool, error) {
 	// Fallback to parsing mountinfo
 	return mountedByMountinfo(path)
 }
+
+func getMountinfo(entry *unix.Statfs_t) *Info {
+	var mountinfo Info
+	mountinfo.Mountpoint = unix.ByteSliceToString(entry.Mntonname[:])
+	mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])
+	mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])
+	return &mountinfo
+}
diff --git a/mountinfo/mountinfo_freebsdlike.go b/mountinfo/mountinfo_freebsdlike.go
deleted file mode 100644
index 952787cd..00000000
--- a/mountinfo/mountinfo_freebsdlike.go
+++ /dev/null
@@ -1,14 +0,0 @@
-//go:build freebsd || darwin
-// +build freebsd darwin
-
-package mountinfo
-
-import "golang.org/x/sys/unix"
-
-func getMountinfo(entry *unix.Statfs_t) *Info {
-	var mountinfo Info
-	mountinfo.Mountpoint = unix.ByteSliceToString(entry.Mntonname[:])
-	mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])
-	mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])
-	return &mountinfo
-}
diff --git a/mountinfo/mountinfo_openbsd.go b/mountinfo/mountinfo_openbsd.go
deleted file mode 100644
index 78ea8cf3..00000000
--- a/mountinfo/mountinfo_openbsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package mountinfo
-
-import "golang.org/x/sys/unix"
-
-func int8SliceToString(is []int8) string {
-	var bs []byte
-	for _, i := range is {
-		if i == 0 {
-			break
-		}
-		bs = append(bs, byte(i))
-	}
-	return string(bs)
-}
-
-func getMountinfo(entry *unix.Statfs_t) *Info {
-	var mountinfo Info
-	mountinfo.Mountpoint = int8SliceToString(entry.F_mntonname[:])
-	mountinfo.FSType = int8SliceToString(entry.F_fstypename[:])
-	mountinfo.Source = int8SliceToString(entry.F_mntfromname[:])
-	return &mountinfo
-}