[CRIU] [PATCH 1/2] tty: Save @flags unconditionaly for consistency

Cyrill Gorcunov gorcunov at openvz.org
Sat May 21 01:33:08 PDT 2016


For easier reading: we need it for pty queued data only,
but this way the code is simplier.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 criu/tty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/tty.c b/criu/tty.c
index 66b4e6f10cfb..1a3442d3e103 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -1660,6 +1660,7 @@ static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 	dinfo->pgrp		= pti->pgrp;
 	dinfo->fd		= p->fd;
 	dinfo->driver		= driver;
+	dinfo->flags		= p->flags;
 
 	if (is_pty(driver)) {
 		dinfo->lfd = dup(lfd);
@@ -1669,7 +1670,6 @@ static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 			return -1;
 		}
 		dinfo->index	= index;
-		dinfo->flags	= p->flags;
 	} else {
 		dinfo->index	= -1;
 		dinfo->lfd	= -1;
-- 
2.5.5



More information about the CRIU mailing list