Merge pull request #5641 from thaJeztah/move_sys_fmountat

fuweid · web-flow · commit c8c6eed93230 · 2021-06-24T22:16:48.000+08:00
move sys.FMountat() into mount package and un-export
diff --git a/mount/fmountat_linux.go b/mount/fmountat_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	"runtime"
@@ -26,8 +26,8 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-// FMountat performs mount from the provided directory.
-func FMountat(dirfd uintptr, source, target, fstype string, flags uintptr, data string) error {
+// fMountat performs mount from the provided directory.
+func fMountat(dirfd uintptr, source, target, fstype string, flags uintptr, data string) error {
 	var (
 		sourceP, targetP, fstypeP, dataP *byte
 		pid                              uintptr
diff --git a/mount/fmountat_linux_test.go b/mount/fmountat_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	"io/ioutil"
@@ -32,7 +32,7 @@ import (
 type fMountatCaseFunc func(t *testing.T, root string)
 
 func TestFMountat(t *testing.T) {
-	if !runningPrivileged() {
+	if unix.Geteuid() != 0 {
 		t.Skip("Needs to be run as root")
 		return
 	}
@@ -88,7 +88,7 @@ func testFMountatNormal(t *testing.T, root string) {
 	defer f.Close()
 
 	// mount work to fs
-	if err = FMountat(f.Fd(), workdir, "fs", "bind", unix.MS_BIND|unix.MS_RDONLY, ""); err != nil {
+	if err = fMountat(f.Fd(), workdir, "fs", "bind", unix.MS_BIND|unix.MS_RDONLY, ""); err != nil {
 		t.Fatalf("expected no error here, but got error: %+v", err)
 	}
 	defer umount(t, fsdir)
@@ -124,7 +124,7 @@ func testFMountatWithFileFd(t *testing.T, root string) {
 	}
 	defer f.Close()
 
-	err = FMountat(f.Fd(), filepath.Join(root, "empty"), filepath.Join(root, "work"), "", 0, "")
+	err = fMountat(f.Fd(), filepath.Join(root, "empty"), filepath.Join(root, "work"), "", 0, "")
 	if !errors.Is(err, expectedErr) {
 		t.Fatalf("expected error %v, but got %v", expectedErr, errors.Cause(err))
 	}
@@ -145,7 +145,7 @@ func testFMountatWithInvalidSource(t *testing.T, root string) {
 	}
 	defer f.Close()
 
-	err = FMountat(f.Fd(), filepath.Join(root, "oops"), "at", "bind", unix.MS_BIND, "")
+	err = fMountat(f.Fd(), filepath.Join(root, "oops"), "at", "bind", unix.MS_BIND, "")
 	if !errors.Is(err, expectedErr) {
 		t.Fatalf("expected error %v, but got %v", expectedErr, err)
 	}
diff --git a/mount/mount_linux.go b/mount/mount_linux.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/containerd/sys"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 )
@@ -378,7 +377,7 @@ func mountAt(chdir string, source, target, fstype string, flags uintptr, data st
 	if !fs.IsDir() {
 		return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")
 	}
-	return errors.Wrap(sys.FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")
+	return errors.Wrap(fMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")
 }
 
 func (m *Mount) mountWithHelper(helperBinary, typePrefix, target string) error {
diff --git a/mount/subprocess_unsafe_linux.go b/mount/subprocess_unsafe_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	_ "unsafe" // required for go:linkname.
diff --git a/mount/subprocess_unsafe_linux.s b/mount/subprocess_unsafe_linux.s

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`	`"time"`
`26`	`26`
`27`		`- "github.com/containerd/containerd/sys"`
`28`	`27`	`"github.com/pkg/errors"`
`29`	`28`	`"golang.org/x/sys/unix"`
`30`	`29`	`)`
`@@ -378,7 +377,7 @@ func mountAt(chdir string, source, target, fstype string, flags uintptr, data st`
`378`	`377`	`if !fs.IsDir() {`
`379`	`378`	`return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")`
`380`	`379`	`}`
`381`		`- return errors.Wrap(sys.FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")`
	`380`	`+ return errors.Wrap(fMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")`
`382`	`381`	`}`
`383`	`382`
`384`	`383`	`func (m *Mount) mountWithHelper(helperBinary, typePrefix, target string) error {`