From b333a7a1f80bce549525000f2285317f5ac82289 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <pebenito@ieee.org>
Date: Sat, 2 Dec 2017 16:19:07 -0500
Subject: [PATCH] filesystem: Rename fs_relabel_cgroup_lnk_files.

---
 policy/modules/kernel/filesystem.if | 36 ++++++++++++++---------------
 policy/modules/system/init.te       |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/policy/modules/kernel/filesystem.if b/policy/modules/kernel/filesystem.if
index 1ae99ea50..a5e969ddd 100644
--- a/policy/modules/kernel/filesystem.if
+++ b/policy/modules/kernel/filesystem.if
@@ -785,24 +785,6 @@ interface(`fs_relabel_cgroup_dirs',`
 	relabel_dirs_pattern($1, cgroup_t, cgroup_t)
 ')
 
-########################################
-## <summary>
-##	Relabel cgroup symbolic links.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`fs_relabel_cgroup_lnk_files',`
-	gen_require(`
-		type cgroup_t;
-	')
-
-	relabel_lnk_files_pattern($1, cgroup_t, cgroup_t)
-')
-
 ########################################
 ## <summary>
 ##     Get attributes of cgroup files.
@@ -942,6 +924,24 @@ interface(`fs_manage_cgroup_files',`
 	dev_search_sysfs($1)
 ')
 
+########################################
+## <summary>
+##	Relabel cgroup symbolic links.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`fs_relabel_cgroup_symlinks',`
+	gen_require(`
+		type cgroup_t;
+	')
+
+	relabel_lnk_files_pattern($1, cgroup_t, cgroup_t)
+')
+
 ########################################
 ## <summary>
 ##	Mount on cgroup directories.
diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te
index ff760a3e4..051059724 100644
--- a/policy/modules/system/init.te
+++ b/policy/modules/system/init.te
@@ -355,7 +355,7 @@ ifdef(`init_systemd',`
 	fs_manage_hugetlbfs_dirs(init_t)
 	fs_getattr_tmpfs(init_t)
 	fs_read_tmpfs_files(init_t)
-	fs_relabel_cgroup_lnk_files(init_t)
+	fs_relabel_cgroup_symlinks(init_t)
 	fs_relabel_pstore_dirs(init_t)
 	fs_dontaudit_getattr_xattr_fs(init_t)
 	fs_create_cgroup_links(init_t)