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

btrfs: make btrfs_subvol_snapshot() parameters a flags field

Browse Source
This commit is contained in:
Lennart Poettering
2015-04-06 14:54:58 +02:00
parent d9e2daaf3d
commit e9bc1871b9
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/import/export-tar.c
+1 -1
View File
@@ -294,7 +294,7 @@ int tar_export_start(TarExport *e, const char *path, int fd, ImportCompressType
return r;
/* Let's try to make a snapshot, if we can, so that the export is atomic */
r = btrfs_subvol_snapshot_fd(sfd, e->temp_path, true, false);
r = btrfs_subvol_snapshot_fd(sfd, e->temp_path, BTRFS_SNAPSHOT_READ_ONLY);
if (r < 0) {
log_debug_errno(r, "Couldn't create snapshot %s of %s, not exporting atomically: %m", e->temp_path, path);
free(e->temp_path);
src/import/pull-common.c
+1 -1
View File
@@ -127,7 +127,7 @@ int pull_make_local_copy(const char *final, const char *image_root, const char *
if (force_local)
(void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
r = btrfs_subvol_snapshot(final, p, false, false);
r = btrfs_subvol_snapshot(final, p, 0);
if (r == -ENOTTY) {
r = copy_tree(final, p, false);
if (r < 0)
src/import/pull-dkr.c
+1 -1
View File
@@ -486,7 +486,7 @@ static int dkr_pull_job_on_open_disk(PullJob *j) {
const char *base_path;
base_path = strjoina(i->image_root, "/.dkr-", base);
r = btrfs_subvol_snapshot(base_path, i->temp_path, false, true);
r = btrfs_subvol_snapshot(base_path, i->temp_path, BTRFS_SNAPSHOT_FALLBACK_COPY);
} else
r = btrfs_subvol_make(i->temp_path);
if (r < 0)