SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal: Copy holes when archiving BTRFS journal files

Browse Source 
Previously, the holes we punched earlier would get removed when
copying the file. Let's enable the new COPY_HOLES flag to make
sure this doesn't happen.

In my test, this drops a 800MB btrfs journal (without compression)
to 720 MB.

Fixes #22087
This commit is contained in:
Daan De Meyer
2022-01-17 16:10:18 +00:00
parent 8646b5d6e6
commit 12727c2bc2
3 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/copy.c
+10 -11
View File
@@ -211,29 +211,28 @@ int copy_bytes_full(
/* To see if we're in a hole, we search for the next data offset. */
e = lseek(fdf, c, SEEK_DATA);
if (e < 0 && errno == ENXIO) {
if (e < 0 && errno == ENXIO)
/* If errno == ENXIO, that means we've reached the final hole of the file and
* that hole isn't followed by more data. */
e = lseek(fdf, 0, SEEK_END);
if (e < 0)
return -errno;
} else if (e < 0)
if (e < 0)
return -errno;
/* If we're in a hole (current offset is not a data offset), create a hole of the same size
* in the target file. */
/* If we're in a hole (current offset is not a data offset), create a hole of the
* same size in the target file. */
if (e > c && lseek(fdt, e - c, SEEK_CUR) < 0)
return -errno;
c = e; /* Set c to the start of the data segment. */
/* After copying a potential hole, find the end of the data segment by looking for the next
* hole. If we get ENXIO, we're at EOF. */
/* After copying a potential hole, find the end of the data segment by looking for
* the next hole. If we get ENXIO, we're at EOF. */
e = lseek(fdf, c, SEEK_HOLE);
if (e < 0 && errno == ENXIO)
break;
else if (e < 0)
if (e < 0) {
if (errno == ENXIO)
break;
return -errno;
}
/* SEEK_HOLE modifies the file offset so we need to move back to the initial offset. */
if (lseek(fdf, c, SEEK_SET) < 0)