From: Milan <me@petabyteboy.de>
Date: Tue, 24 Apr 2018 09:38:08 +0000 (+0200)
Subject: nspawn: fix copy/reflink fallback when directory already exists (#8781)
X-Git-Tag: v239~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=679def2a0644d4ffeb8561ac78bcc175cfd2aa25;p=thirdparty%2Fsystemd.git

nspawn: fix copy/reflink fallback when directory already exists (#8781)
---

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 77e9d909176..7720d98009f 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -1690,7 +1690,7 @@ int btrfs_subvol_snapshot_fd(int old_fd, const char *new_path, BtrfsSnapshotFlag
                 if (r == -ENOTTY && (flags & BTRFS_SNAPSHOT_FALLBACK_DIRECTORY)) {
                         /* If the destination doesn't support subvolumes, then use a plain directory, if that's requested. */
                         if (mkdir(new_path, 0755) < 0)
-                                return r;
+                                return -errno;
 
                         plain_directory = true;
                 } else if (r < 0)