[2/7] fd: Rename fdparms.ctl -> .fd_ctl

Submitted by Pavel Emelianov on Sept. 28, 2016, 7:41 a.m.

Details

Message ID 57EB7432.3020807@virtuozzo.com
State Accepted
Series "Prepare parasite_ctl for being internal to compel"
Commit 8b407d34f62560719987fd940b8bc24edb0c3139
Headers show

Commit Message

Pavel Emelianov Sept. 28, 2016, 7:41 a.m.
For easier grepping.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/files.c         | 2 +-
 criu/include/files.h | 2 +-
 criu/tty.c           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/files.c b/criu/files.c
index cfbaca7..aa3185b 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -325,7 +325,7 @@  static int fill_fd_params(struct parasite_ctl *ctl, int fd, int lfd,
 		return -1;
 
 	p->fs_type	= fsbuf.f_type;
-	p->ctl		= ctl;
+	p->fd_ctl	= ctl;
 	p->fd		= fd;
 	p->pos		= fdinfo.pos;
 	p->flags	= fdinfo.flags;
diff --git a/criu/include/files.h b/criu/include/files.h
index 7513b21..af171ec 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -49,7 +49,7 @@  struct fd_parms {
 	long		fs_type;
 	int		mnt_id;
 
-	struct parasite_ctl *ctl;
+	struct parasite_ctl *fd_ctl;
 };
 
 #define FD_PARMS_INIT			\
diff --git a/criu/tty.c b/criu/tty.c
index 8090e22..59a4bbc 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -1693,7 +1693,7 @@  static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 	BUILD_BUG_ON(sizeof(termios.c_cc) != sizeof(void *));
 	BUILD_BUG_ON((sizeof(termios.c_cc) * TERMIOS_NCC) < sizeof(t.c_cc));
 
-	pti = parasite_dump_tty(p->ctl, p->fd, driver->type);
+	pti = parasite_dump_tty(p->fd_ctl, p->fd, driver->type);
 	if (!pti)
 		return -1;