restore: auto-unlink for ghost files (v2)

A ghost file is used for restoring descriptors of an unlinked file.
It is created, opened and deleted.

Currently ghost files are collected in root task and then removed
by crtools when everybody is restored. This scheme doesn't work,
ghost_file_list is not shared, plus tasks may live in different mount
namespace.

It was broken by the following commit:
bd4e5d2f restore: prepare shared objects after initializing namespaces

We can't just move clear_ghost_files(), because we need to wait, until
all processes have not opened a ghost file.
We can add one more global barrier or move clear_ghost_files() in
a restore code bellow an existent barrier.

Here is a better sollution, a gost file is deleted by the last user.

v2: Use the type atomic_t and fix a commit message.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-restore.c

@@ -893,11 +893,6 @@ out:
 		return -1;
 	}
 
-	/*
-	 * Maybe rework ghosts to be auto-unlinkable?
-	 */
-
-	clear_ghost_files();
 	tcp_unlock_connections();
 
 	pr_info("Go on!!!\n");

files-reg.c

@@ -12,6 +12,7 @@
 #include "image.h"
 #include "list.h"
 #include "util.h"
+#include "atomic.h"
 
 #include "protobuf.h"
 #include "protobuf/regfile.pb-c.h"
@@ -36,6 +37,7 @@ struct ghost_file {
 			char *path;
 		};
 	};
+	atomic_t users;
 };
 
 static u32 ghost_file_ids = 1;
@@ -47,17 +49,6 @@ static LIST_HEAD(ghost_files);
  */
 #define MAX_GHOST_FILE_SIZE	(1 * 1024 * 1024)
 
-void clear_ghost_files(void)
-{
-	struct ghost_file *gf;
-
-	pr_info("Unlinking ghosts\n");
-	list_for_each_entry(gf, &ghost_files, list) {
-		pr_info("\t`- %s\n", gf->path);
-		unlink(gf->path);
-	}
-}
-
 static int open_remap_ghost(struct reg_file_info *rfi,
 		RemapFilePathEntry *rfe)
 {
@@ -77,7 +68,7 @@ static int open_remap_ghost(struct reg_file_info *rfi,
 
 	pr_info("Opening ghost file %#x for %s\n", rfe->remap_id, rfi->path);
 
-	gf = xmalloc(sizeof(*gf));
+	gf = shmalloc(sizeof(*gf));
 	if (!gf)
 		return -1;
 	gf->path = xmalloc(PATH_MAX);
@@ -123,16 +114,18 @@ static int open_remap_ghost(struct reg_file_info *rfi,
 	close(gfd);
 
 	gf->id = rfe->remap_id;
+	atomic_set(&gf->users, 0);
 	list_add_tail(&gf->list, &ghost_files);
 gf_found:
-	rfi->remap_path = gf->path;
+	atomic_inc(&gf->users);
+	rfi->ghost = gf;
 	return 0;
 
 err:
 	if (gfe)
 		ghost_file_entry__free_unpacked(gfe, NULL);
 	xfree(gf->path);
-	xfree(gf);
+	shfree_last(gf);
 	return -1;
 }
 
@@ -358,10 +351,10 @@ static int open_path(struct file_desc *d,
 
 	rfi = container_of(d, struct reg_file_info, d);
 
-	if (rfi->remap_path)
-		if (link(rfi->remap_path, rfi->path) < 0) {
+	if (rfi->ghost)
+		if (link(rfi->ghost->path, rfi->path) < 0) {
 			pr_perror("Can't link %s -> %s\n",
-					rfi->remap_path, rfi->path);
+					rfi->ghost->path, rfi->path);
 			return -1;
 		}
 
@@ -371,8 +364,13 @@ static int open_path(struct file_desc *d,
 		return -1;
 	}
 
-	if (rfi->remap_path)
+	if (rfi->ghost) {
 		unlink(rfi->path);
+		if (atomic_dec_and_test(&rfi->ghost->users)) {
+			pr_info("Unlink the ghost %s\n", rfi->ghost->path);
+			unlink(rfi->ghost->path);
+		}
+	}
 
 	if (restore_fown(tmp, rfi->rfe->fown))
 		return -1;
@@ -432,7 +430,7 @@ static int collect_one_regfile(void *o, ProtobufCMessage *base)
 
 	rfi->rfe = pb_msg(base, RegFileEntry);
 	rfi->path = rfi->rfe->name;
-	rfi->remap_path = NULL;
+	rfi->ghost = NULL;
 
 	pr_info("Collected [%s] ID %#x\n", rfi->path, rfi->rfe->id);
 	file_desc_add(&rfi->d, rfi->rfe->id, &reg_desc_ops);

include/files-reg.h

@@ -11,10 +11,11 @@
 struct cr_fdset;
 struct fd_parms;
 
+struct ghost_file;
 struct reg_file_info {
 	struct file_desc	d;
 	RegFileEntry		*rfe;
-	char			*remap_path;
+	struct ghost_file	*ghost;
 	char			*path;
 };