From 1f776f5b9502ab9891927879ec3e0fa23cc24e9f Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Mon, 3 Mar 2014 11:31:03 -0500
Subject: [PATCH] Fix typo I introduced in the bdev change.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 src/lxc/bdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.47.2