From: Christian Brauner <christian.brauner@mailbox.org>
Date: Sat, 12 Dec 2015 22:21:55 +0000 (+0100)
Subject: Adapt #includes for bdev.h to bdev/bdev.h
X-Git-Tag: lxc-2.0.0.beta1~6^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec31c52242ebeacf67a0291c4f100e2b4a8c343;p=thirdparty%2Flxc.git

Adapt #includes for bdev.h to bdev/bdev.h

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
---

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index 94b3d879c..da88bb7c2 100644
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -43,7 +43,7 @@
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"
diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index b82be599c..d69eb3dd8 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -46,7 +46,7 @@
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 2ebf87619..c9cfcc205 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -71,7 +71,7 @@
 #include "conf.h"
 #include "log.h"
 #include "caps.h"       /* for lxc_caps_last_cap() */
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "cgroup.h"
 #include "lxclock.h"
 #include "namespace.h"
@@ -2623,7 +2623,7 @@ void restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf)
 {
 	int i, ret, oldfd;
 	char path[MAXPATHLEN];
-	char ifname[IFNAMSIZ]; 
+	char ifname[IFNAMSIZ];
 
 	if (netnsfd < 0)
 		return;
diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 5ca4f9ff7..74c47723b 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -34,7 +34,7 @@
 
 #include "config.h"
 
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "commands.h"
diff --git a/src/lxc/lxc_copy.c b/src/lxc/lxc_copy.c
index 9678b5042..98121764e 100644
--- a/src/lxc/lxc_copy.c
+++ b/src/lxc/lxc_copy.c
@@ -44,7 +44,7 @@
 #include "conf.h"
 #include "state.h"
 #include "utils.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 
 #ifndef HAVE_GETSUBOPT
 #include <../include/getsubopt.h>
diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index fcbac6eda..e72256aae 100644
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -29,7 +29,7 @@
 
 #include "lxc.h"
 #include "log.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "arguments.h"
 #include "utils.h"
 
diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 6bfb71364..147101eb4 100644
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -29,7 +29,7 @@
 
 #include "lxc.h"
 #include "log.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "arguments.h"
 #include "utils.h"
 
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 52315cbb5..ddec8029a 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -69,7 +69,7 @@
 #include "namespace.h"
 #include "lxcseccomp.h"
 #include "caps.h"
-#include "bdev.h"
+#include "bdev/bdev.h"
 #include "lsm/lsm.h"
 #include "lxclock.h"