Rename FindCgroupMountpointAndSource

Rename it to FindCgroupMountpointAndRoot. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
sithembiso · Sep 9, 2015 · f2ec7ef · f2ec7ef
1 parent bc67941
commit f2ec7ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go
@@ -235,20 +235,20 @@ func getCgroupData(c *configs.Cgroup, pid int) (*data, error) {
 	}, nil
 }
 
-func (raw *data) parent(subsystem, mountpoint, src string) (string, error) {
+func (raw *data) parent(subsystem, mountpoint, root string) (string, error) {
 	initPath, err := cgroups.GetThisCgroupDir(subsystem)
 	if err != nil {
 		return "", err
 	}
-	relDir, err := filepath.Rel(src, initPath)
+	relDir, err := filepath.Rel(root, initPath)
 	if err != nil {
 		return "", err
 	}
 	return filepath.Join(mountpoint, relDir), nil
 }
 
 func (raw *data) path(subsystem string) (string, error) {
-	mnt, src, err := cgroups.FindCgroupMountpointAndSource(subsystem)
+	mnt, root, err := cgroups.FindCgroupMountpointAndRoot(subsystem)
 	// If we didn't mount the subsystem, there is no point we make the path.
 	if err != nil {
 		return "", err
@@ -259,7 +259,7 @@ func (raw *data) path(subsystem string) (string, error) {
 		return filepath.Join(raw.root, filepath.Base(mnt), raw.cgroup), nil
 	}
 
-	parent, err := raw.parent(subsystem, mnt, src)
+	parent, err := raw.parent(subsystem, mnt, root)
 	if err != nil {
 		return "", err
 	}

diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
@@ -47,7 +47,7 @@ func FindCgroupMountpoint(subsystem string) (string, error) {
 	return "", NewNotFoundError(subsystem)
 }
 
-func FindCgroupMountpointAndSource(subsystem string) (string, string, error) {
+func FindCgroupMountpointAndRoot(subsystem string) (string, string, error) {
 	f, err := os.Open("/proc/self/mountinfo")
 	if err != nil {
 		return "", "", err