From dc80d6f125e1e919363a0b8f938b8679ff0dbc2b Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 15 Nov 2013 23:04:28 +0400 Subject: [PATCH] log: get rid of LOG_DIR_FD_OFF and opening cwd in log_init() Signed-off-by: Ruslan Kuprieiev Signed-off-by: Pavel Emelyanov --- cr-restore.c | 1 - cr-service.c | 2 -- include/servicefd.h | 1 - log.c | 26 ++------------------------ 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/cr-restore.c b/cr-restore.c index 3fa55dccaf..27169e79d2 100644 --- a/cr-restore.c +++ b/cr-restore.c @@ -870,7 +870,6 @@ static int restore_one_task(int pid, CoreEntry *core) int ret; /* No more fork()-s => no more per-pid logs */ - log_closedir(); switch ((int)core->tc->task_state) { case TASK_ALIVE: diff --git a/cr-service.c b/cr-service.c index d2724e5cef..a10d07fa35 100644 --- a/cr-service.c +++ b/cr-service.c @@ -124,8 +124,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req) if (open_image_dir(".") < 0) return -1; - log_closedir(); - /* initiate log file in imgs dir */ if (req->log_file) opts.output = req->log_file; diff --git a/include/servicefd.h b/include/servicefd.h index 862cd1088d..ea52beafe2 100644 --- a/include/servicefd.h +++ b/include/servicefd.h @@ -7,7 +7,6 @@ enum sfd_type { SERVICE_FD_MIN, LOG_FD_OFF, - LOG_DIR_FD_OFF, IMG_FD_OFF, PROC_FD_OFF, /* fd with /proc for all proc_ calls */ CTL_TTY_OFF, diff --git a/log.c b/log.c index a3b147212e..8a6ed0689e 100644 --- a/log.c +++ b/log.c @@ -63,29 +63,13 @@ int log_get_fd(void) int log_init(const char *output) { - int new_logfd, dfd, fd; + int new_logfd, fd; gettimeofday(&start, NULL); buf_off = TS_BUF_OFF; - dfd = get_service_fd(LOG_DIR_FD_OFF); - if (dfd < 0) { - int tmp; - tmp = open(".", O_RDONLY); - if (tmp == -1) { - pr_perror("Can't open a current directory"); - return -1; - } - - dfd = install_service_fd(LOG_DIR_FD_OFF, tmp); - close(tmp); - if (dfd < 0) - return -1; - } - if (output) { - new_logfd = openat(dfd, output, - O_CREAT | O_TRUNC | O_WRONLY | O_APPEND, 0600); + new_logfd = open(output, O_CREAT|O_TRUNC|O_WRONLY|O_APPEND, 0600); if (new_logfd < 0) { pr_perror("Can't create log file %s", output); return -1; @@ -137,12 +121,6 @@ int log_init_by_pid(void) void log_fini(void) { close_service_fd(LOG_FD_OFF); - log_closedir(); -} - -void log_closedir(void) -{ - close_service_fd(LOG_DIR_FD_OFF); } void log_set_loglevel(unsigned int level)