From e9bc1871b974fa9e33d9c1a45e249e6d1c8bc562 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Apr 2015 11:47:25 +0200
Subject: btrfs: make btrfs_subvol_snapshot() parameters a flags field

---
 src/import/export-tar.c  | 2 +-
 src/import/pull-common.c | 2 +-
 src/import/pull-dkr.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/import')

diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index c2fd656527..7fae06240a 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -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);
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index ee0c064dfc..efd67a2937 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -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)
diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index 402ddac32b..c922bace45 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -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)
-- 
cgit v1.2.3-54-g00ecf