restore: Close ns_last_pid file fd

Otherwise it pops up after restore in target task's fdtable.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

cr-restore.c

@@ -1344,7 +1344,7 @@ static void sigreturn_restore(pid_t pstree_pid, pid_t pid)
 	 * restorer code, thus unlink it early to make it disappear
 	 * as soon as we close it
 	 */
-	unlink(self_vmas_path);
+	// unlink(self_vmas_path);
 
 	if (fd_self_vmas < 0) {
 		pr_perror("Can't open %s\n", self_vmas_path);

restorer.c

@@ -542,6 +542,8 @@ self_len_end:
 				write_num_n(ret);
 				goto core_restore_end;
 			}
+
+			sys_close(fd);
 		}
 
 		/*

test/zdtm.sh

@@ -35,6 +35,7 @@ run_test()
 	pid=`cat $test.pid`
 	ddump="dump/$tname/$pid"
 	mkdir -p $ddump
+	ls -l /proc/$pid/fd/
 	setsid $CRTOOLS -D $ddump -o dump.log -d -t $pid || return 1
 	while :; do
 		killall -9 $tname &> /dev/null || break;
@@ -43,6 +44,7 @@ run_test()
 	done
 	setsid $CRTOOLS -D $ddump -o restore.log -r -t $pid &
 	sleep 1
+	ls -l /proc/$pid/fd/
 	make -C $tdir $tname.out
 	wait || return 1
 	for i in `seq 5`; do