un-export mount.FMountat

thaJeztah · thaJeztah · commit a964cf0cc4be · 2021-06-23T18:14:53.000+02:00
It's only used internally, so we can un-export this utility until
it is needed elsewhere.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/mount/fmountat_linux.go b/mount/fmountat_linux.go
@@ -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
@@ -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
@@ -377,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(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 {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func testFMountatNormal(t *testing.T, root string) {`
`88`	`88`	`defer f.Close()`
`89`	`89`
`90`	`90`	`// mount work to fs`
`91`		`- if err = FMountat(f.Fd(), workdir, "fs", "bind", unix.MS_BIND\|unix.MS_RDONLY, ""); err != nil {`
	`91`	`+ if err = fMountat(f.Fd(), workdir, "fs", "bind", unix.MS_BIND\|unix.MS_RDONLY, ""); err != nil {`
`92`	`92`	`t.Fatalf("expected no error here, but got error: %+v", err)`
`93`	`93`	`}`
`94`	`94`	`defer umount(t, fsdir)`
`@@ -124,7 +124,7 @@ func testFMountatWithFileFd(t *testing.T, root string) {`
`124`	`124`	`}`
`125`	`125`	`defer f.Close()`
`126`	`126`
`127`		`- err = FMountat(f.Fd(), filepath.Join(root, "empty"), filepath.Join(root, "work"), "", 0, "")`
	`127`	`+ err = fMountat(f.Fd(), filepath.Join(root, "empty"), filepath.Join(root, "work"), "", 0, "")`
`128`	`128`	`if !errors.Is(err, expectedErr) {`
`129`	`129`	`t.Fatalf("expected error %v, but got %v", expectedErr, errors.Cause(err))`
`130`	`130`	`}`
`@@ -145,7 +145,7 @@ func testFMountatWithInvalidSource(t *testing.T, root string) {`
`145`	`145`	`}`
`146`	`146`	`defer f.Close()`
`147`	`147`
`148`		`- err = FMountat(f.Fd(), filepath.Join(root, "oops"), "at", "bind", unix.MS_BIND, "")`
	`148`	`+ err = fMountat(f.Fd(), filepath.Join(root, "oops"), "at", "bind", unix.MS_BIND, "")`
`149`	`149`	`if !errors.Is(err, expectedErr) {`
`150`	`150`	`t.Fatalf("expected error %v, but got %v", expectedErr, err)`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ func mountAt(chdir string, source, target, fstype string, flags uintptr, data st`
`377`	`377`	`if !fs.IsDir() {`
`378`	`378`	`return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")`
`379`	`379`	`}`
`380`		`- return errors.Wrap(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")`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`func (m *Mount) mountWithHelper(helperBinary, typePrefix, target string) error {`