check for btrfs fs in should_default_to_snapshot

Check if we're really on a btrfs filesystem before we call btrfs_same_fs(). Otherwise we will report misleading errors although everything went fine. Signed-off-by: Christian Brauner <christian.brauner@mailbox.org> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

check for btrfs fs in should_default_to_snapshot
9a09badc · Christian Brauner · Stéphane Graber · 7cfe3dd7 · 9a09badc · 9a09badc
Commit 9a09badc authored Jan 14, 2016 by Christian Brauner Committed by Stéphane Graber Jan 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

lxcbtrfs.c src/lxc/bdev/lxcbtrfs.c +1 -1

lxcoverlay.c src/lxc/bdev/lxcoverlay.c +1 -1

lxccontainer.c src/lxc/lxccontainer.c +4 -0

No files found.
--- a/src/lxc/bdev/lxcbtrfs.c
+++ b/src/lxc/bdev/lxcbtrfs.c
@@ -40,7 +40,7 @@
 #include "lxcrsync.h"
 #include "utils.h"

-lxc_log_define(btrfs, lxc);
+lxc_log_define(lxcbtrfs, lxc);

 /* defined in lxccontainer.c: needs to become common helper */
 extern char *dir_new_path(char *src, const char *oldname, const char *name,

--- a/src/lxc/bdev/lxcoverlay.c
+++ b/src/lxc/bdev/lxcoverlay.c
@@ -36,7 +36,7 @@
 #include "lxcrsync.h"
 #include "utils.h"

-lxc_log_define(overlay, lxc);
+lxc_log_define(lxcoverlay, lxc);

 static char *ovl_name;


--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2833,6 +2833,10 @@ bool should_default_to_snapshot(struct lxc_container *c0,

 	snprintf(p0, l0, "%s/%s", c0->config_path, c0->name);
 	snprintf(p1, l1, "%s/%s", c1->config_path, c1->name);
+
+	if (!is_btrfs_fs(p0) || !is_btrfs_fs(p1))
+		return false;
+
 	return btrfs_same_fs(p0, p1) == 0;
 }