From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 3 Mar 2014 16:31:03 +0000 (-0500)
Subject: Fix typo I introduced in the bdev change.
X-Git-Tag: lxc-1.1.0.alpha1~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e27141fa26588b2228cf9c35d742a5180caa44d4;p=thirdparty%2Flxc.git

Fix typo I introduced in the bdev change.

When adding the missing return value in Caglar's change (as discussed on
the mailing-list), I set err = -1 instead or ret = -1, causing an
obvious build failure...

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index 31d1a49e0..49ba8ae67 100644
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1365,7 +1365,7 @@ static int btrfs_same_fs(const char *orig, const char *new) {
 	fd_new = open(new, O_RDONLY);
 	if (fd_new < 0) {
 		SYSERROR("Error opening new container dir %s", new);
-		err = -1;
+		ret = -1;
 		goto out;
 	}
 	ret = ioctl(fd_new, BTRFS_IOC_FS_INFO, &new_args);