postgrespro
diff --git a/‎src/backup.c
+5-8 b/‎src/backup.c
+5-8
diff --git a/‎src/data.c
+3-3 b/‎src/data.c
+3-3
@@ -2025,7 +2025,8 @@ pg_stop_backup(pgBackup *backup)
 			 */
 			if (backup_files_list)
 			{
-				file = pgFileNew(backup_label, true, 0, FIO_BACKUP_HOST);
+				file = pgFileNew(backup_label, backup_label, true, 0,
+								 FIO_BACKUP_HOST);
 				file->crc = pgFileGetCRC(file->path, true, false,
 										 &file->read_size, FIO_BACKUP_HOST);
 				file->write_size = file->read_size;
@@ -2070,7 +2071,8 @@ pg_stop_backup(pgBackup *backup)
 
 			if (backup_files_list)
 			{
-				file = pgFileNew(tablespace_map, true, 0, FIO_BACKUP_HOST);
+				file = pgFileNew(tablespace_map, tablespace_map, true, 0,
+								 FIO_BACKUP_HOST);
 				if (S_ISREG(file->mode))
 				{
 					file->crc = pgFileGetCRC(file->path, true, false,
@@ -2476,7 +2478,6 @@ backup_files(void *arg)
 									file);
 			else
 			{
-				const char *src;
 				const char *dst;
 				bool		skip = false;
 				char		external_dst[MAXPGPATH];
@@ -2498,16 +2499,12 @@ backup_files(void *arg)
 					makeExternalDirPathByNum(external_dst,
 											 arguments->external_prefix,
 											 file->external_dir_num);
-					src = external_path;
 					dst = external_dst;
 				}
 				else
-				{
-					src = arguments->from_root;
 					dst = arguments->to_root;
-				}
 				if (skip ||
-					!copy_file(src, FIO_DB_HOST, dst, FIO_BACKUP_HOST, file))
+					!copy_file(FIO_DB_HOST, dst, FIO_BACKUP_HOST, file))
 				{
 					/* disappeared file not to be confused with 'not changed' */
 					if (file->write_size != FILE_NOT_FOUND)
 
@@ -938,8 +938,8 @@ restore_data_file(const char *to_path, pgFile *file, bool allow_truncate,
  * it is either small control file or already compressed cfs file.
  */
 bool
-copy_file(const char *from_root, fio_location from_location,
-		  const char *to_root, fio_location to_location, pgFile *file)
+copy_file(fio_location from_location, const char *to_root,
+		  fio_location to_location, pgFile *file)
 {
 	char		to_path[MAXPGPATH];
 	FILE	   *in;
@@ -976,7 +976,7 @@ copy_file(const char *from_root, fio_location from_location,
 	}
 
 	/* open backup file for write  */
-	join_path_components(to_path, to_root, file->path + strlen(from_root) + 1);
+	join_path_components(to_path, to_root, file->rel_path);
 	out = fio_fopen(to_path, PG_BINARY_W, to_location);
 	if (out == NULL)
 	{
Original file line number	Diff line number	Diff line change
`@@ -938,8 +938,8 @@ restore_data_file(const char to_path, pgFile file, bool allow_truncate,`
`938`	`938`	`* it is either small control file or already compressed cfs file.`
`939`	`939`	`*/`
`940`	`940`	`bool`
`941`		`-copy_file(const char *from_root, fio_location from_location,`
`942`		`- const char to_root, fio_location to_location, pgFile file)`
	`941`	`+copy_file(fio_location from_location, const char *to_root,`
	`942`	`+ fio_location to_location, pgFile *file)`
`943`	`943`	`{`
`944`	`944`	`char to_path[MAXPGPATH];`
`945`	`945`	`FILE *in;`
`@@ -976,7 +976,7 @@ copy_file(const char *from_root, fio_location from_location,`
`976`	`976`	`}`
`977`	`977`
`978`	`978`	`/* open backup file for write */`
`979`		`- join_path_components(to_path, to_root, file->path + strlen(from_root) + 1);`
	`979`	`+ join_path_components(to_path, to_root, file->rel_path);`
`980`	`980`	`out = fio_fopen(to_path, PG_BINARY_W, to_location);`
`981`	`981`	`if (out == NULL)`
`982`	`982`	`{`