From 705bf5aba6bd428e2f64179d7094597f2d616966 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 6 Apr 2012 21:39:10 +0400 Subject: [PATCH] img: Hide image dir fd into util.c No image copy occurs since 2b175282, so this fd can be hidden. Thus fixind the FIXME near it :) Signed-off-by: Pavel Emelyanov --- include/crtools.h | 5 ----- util.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/crtools.h b/include/crtools.h index de46c0c10..55681c8f7 100644 --- a/include/crtools.h +++ b/include/crtools.h @@ -114,11 +114,6 @@ extern struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX]; #define FMT_FNAME_IPCNS_SEM "ipcns-sem-%d.img" #define FMT_FNAME_SK_QUEUES "sk-queues.img" -/* - * FIXME -- this is required for legacy image copy only. - * Don't use it for other reason and remove the former one. - */ -extern int image_dir_fd; extern int open_image_dir(void); extern void close_image_dir(void); diff --git a/util.c b/util.c index 7b25367e1..f2626d9b7 100644 --- a/util.c +++ b/util.c @@ -129,6 +129,8 @@ int move_img_fd(int *img_fd, int want_fd) return 0; } +static int image_dir_fd = -1; + int open_image(int type, unsigned long flags, ...) { char path[PATH_MAX]; @@ -172,8 +174,6 @@ err: return -1; } -int image_dir_fd = -1; - int open_image_dir(void) { int fd;