[CRIU] [PATCH] ipc: Don't inject timestamps into informative message

Cyrill Gorcunov gorcunov at gmail.com
Fri Oct 23 08:17:17 PDT 2015


On Fri, Oct 23, 2015 at 06:10:56PM +0300, Pavel Emelyanov wrote:
> > +		       "id: %-10d key: 0x%08x ", desc->id, desc->key,
> > +		       "uid: %-10d gid: %-10d ", desc->uid, desc->gid,
> > +		       "cuid: %-10d cgid: %-10d ", desc->cuid, desc->cgid,
> > +		       "mode: %-10o ", desc->mode);
> 
> Are you sure about it?

:-) Heh, thanks. Forgot to autosquash the fixup.
-------------- next part --------------
>From a2e306b348d1a9414de9386ca036d50d4ea884e6 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Fri, 23 Oct 2015 18:06:06 +0300
Subject: [PATCH] ipc: Don't inject timestamps into informative message

Every print_on_level() injects timestamp, better to
print it in one pass for readability.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 ipc_ns.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipc_ns.c b/ipc_ns.c
index 06d31000f3d9..3bc0c6523634 100644
--- a/ipc_ns.c
+++ b/ipc_ns.c
@@ -37,10 +37,10 @@
 
 static void pr_ipc_desc_entry(unsigned int loglevel, const IpcDescEntry *desc)
 {
-	print_on_level(loglevel, "id: %-10d key: 0x%08x ", desc->id, desc->key);
-	print_on_level(loglevel, "uid: %-10d gid: %-10d ", desc->uid, desc->gid);
-	print_on_level(loglevel, "cuid: %-10d cgid: %-10d ", desc->cuid, desc->cgid);
-	print_on_level(loglevel, "mode: %-10o ", desc->mode);
+	print_on_level(loglevel, "id: %-10d key: 0x%08x uid: %-10d gid: %-10d "
+		       "cuid: %-10d cgid: %-10d mode: %-10o ",
+		       desc->id, desc->key, desc->uid, desc->gid,
+		       desc->cuid, desc->cgid, desc->mode);
 }
 
 static void fill_ipc_desc(int id, IpcDescEntry *desc, const struct ipc_perm *ipcp)
-- 
2.4.3



More information about the CRIU mailing list