From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Apr 2020 09:57:00 +0000 (+0200)
Subject: import: use our new btrfs_subvol_make_fallback() at two places
X-Git-Tag: v246-rc1~609^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c4440ddd0ae1f8846ea689ec5d15dab018f600;p=thirdparty%2Fsystemd.git

import: use our new btrfs_subvol_make_fallback() at two places
---

diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 1e50d31bc2b..5d2bf22fb25 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -220,13 +220,10 @@ static int tar_import_fork_tar(TarImport *i) {
 
         (void) mkdir_parents_label(i->temp_path, 0700);
 
-        r = btrfs_subvol_make(i->temp_path);
-        if (r == -ENOTTY) {
-                if (mkdir(i->temp_path, 0755) < 0)
-                        return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path);
-        } else if (r < 0)
-                return log_error_errno(r, "Failed to create subvolume %s: %m", i->temp_path);
-        else
+        r = btrfs_subvol_make_fallback(i->temp_path, 0755);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create directory/subvolume %s: %m", i->temp_path);
+        if (r > 0) /* actually btrfs subvol */
                 (void) import_assign_pool_quota_and_warn(i->temp_path);
 
         i->tar_fd = import_fork_tar_x(i->temp_path, &i->tar_pid);
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 3930578a8ce..ede28bee1b1 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -415,13 +415,10 @@ static int tar_pull_job_on_open_disk_tar(PullJob *j) {
 
         mkdir_parents_label(i->temp_path, 0700);
 
-        r = btrfs_subvol_make(i->temp_path);
-        if (r == -ENOTTY) {
-                if (mkdir(i->temp_path, 0755) < 0)
-                        return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path);
-        } else if (r < 0)
-                return log_error_errno(r, "Failed to create subvolume %s: %m", i->temp_path);
-        else
+        r = btrfs_subvol_make_fallback(i->temp_path, 0755);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create directory/subvolume %s: %m", i->temp_path);
+        if (r > 0) /* actually btrfs subvol */
                 (void) import_assign_pool_quota_and_warn(i->temp_path);
 
         j->disk_fd = import_fork_tar_x(i->temp_path, &i->tar_pid);