[Devel] [PATCH] ve: Show UUID in /proc/vz/devperms instead of CTid

[Kirill Tkhai]

New vzctl works with UUID, not ID. We should show it.

Alignment 36 is default UUID lenght.

https://jira.sw.ru/browse/PSBM-34317

Signed-off-by: Kirill Tkhai <ktkhai at odin.com>
---
 kernel/ve/vecalls.c      |    4 ++--
 security/device_cgroup.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/ve/vecalls.c b/kernel/ve/vecalls.c
index e2c9021..58c6f48 100644
--- a/kernel/ve/vecalls.c
+++ b/kernel/ve/vecalls.c
@@ -874,12 +874,12 @@ static int devperms_seq_show(struct seq_file *m, void *v)
 	struct ve_struct *ve = list_entry(v, struct ve_struct, ve_list);
 
 	if (m->private == (void *)0) {
-		seq_printf(m, "Version: 2.7\n");
+		seq_printf(m, "Version: 2.8\n");
 		m->private = (void *)-1;
 	}
 
 	if (ve_is_super(ve))
-		seq_printf(m, "%10u b 016 *:*\n%10u c 006 *:*\n", 0, 0);
+		seq_printf(m, "%36u b 016 *:*\n%10u c 006 *:*\n", 0, 0);
 	else
 		devcgroup_seq_show_ve(devices_root, ve, m);
 
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 33a9883..15d90b6 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -1118,8 +1118,8 @@ int devcgroup_seq_show_ve(struct cgroup *devices_root, struct ve_struct *ve, str
 		if (perm & (S_IROTH | S_IWOTH))
 			perm |= S_IXOTH;
 
-		seq_printf(m, "%10u %c %03o %s:%s\n",
-				ve->veid,
+		seq_printf(m, "%s %c %03o %s:%s\n",
+				ve_name(ve),
 				type_to_char(wh->type),
 				perm, maj, min);
 	}