[CRIU] [crtools-bot for Kinsbursky Stanislav ] dump: remove else

Cyrill Gorcunov gorcunov at openvz.org
Fri Mar 2 02:25:46 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit ba6ac0104e993ed90861136992c993a98e638f8a
Author: Kinsbursky Stanislav <skinsbursky at openvz.org>
Date:   Thu Mar 1 20:56:34 2012 +0300

    dump: remove else
    
    Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 cr-dump.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-dump.c b/cr-dump.c
index 1910971..0da158d 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -124,6 +124,7 @@ static int dump_one_reg_file(struct fd_parms *p, int lfd,
 	e.flags = p->flags;
 	e.pos	= p->pos;
 	e.addr	= p->fd_name;
+	e.id	= FD_ID_INVALID;
 
 	if (likely(!fd_is_special(&e))) {
 		struct fd_id_entry *entry;
@@ -140,8 +141,7 @@ static int dump_one_reg_file(struct fd_parms *p, int lfd,
 
 		/* Now it might have completely new ID here */
 		e.id	= entry->u.id;
-	} else
-		e.id	= FD_ID_INVALID;
+	}
 
 	pr_info("fdinfo: type: %2x len: %2x flags: %4x pos: %8lx addr: %16lx\n",
 		p->type, len, p->flags, p->pos, p->fd_name);


More information about the CRIU mailing list