storage: rename files "bdev" -> "storage"

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 3e15ffa7e674ef333999fbf3e6ca3eb738d22279..0a4f346765170f95d3cde5e34c1a954fc09972ea 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -6,18 +6,18 @@ pkginclude_HEADERS = \
 noinst_HEADERS = \
        arguments.h \
        attach.h \
-       bdev/bdev.h \
-       bdev/lxcaufs.h \
-       bdev/lxcbtrfs.h \
-       bdev/lxcdir.h \
-       bdev/lxcloop.h \
-       bdev/lxclvm.h \
-       bdev/lxcnbd.h \
-       bdev/lxcoverlay.h \
-       bdev/lxcrbd.h \
-       bdev/lxcrsync.h \
-       bdev/lxczfs.h \
-       bdev/storage_utils.h \
+       storage/storage.h \
+       storage/aufs.h \
+       storage/btrfs.h \
+       storage/dir.h \
+       storage/loop.h \
+       storage/lvm.h \
+       storage/nbd.h \
+       storage/overlay.h \
+       storage/rbd.h \
+       storage/rsync.h \
+       storage/zfs.h \
+       storage/storage_utils.h \
        cgroups/cgroup.h \
        cgroups/cgroup_utils.h \
        caps.h \
@@ -73,18 +73,18 @@ endif
 lib_LTLIBRARIES = liblxc.la
 liblxc_la_SOURCES = \
        arguments.c arguments.h \
-       bdev/bdev.c bdev/bdev.h \
-       bdev/lxcaufs.c bdev/lxcaufs.h \
-       bdev/lxcbtrfs.c bdev/lxcbtrfs.h \
-       bdev/lxcdir.c bdev/lxcdir.h \
-       bdev/lxcloop.c bdev/lxcloop.h \
-       bdev/lxclvm.c bdev/lxclvm.h \
-       bdev/lxcnbd.c bdev/lxcnbd.h \
-       bdev/lxcoverlay.c bdev/lxcoverlay.h \
-       bdev/lxcrbd.c bdev/lxcrbd.h \
-       bdev/lxcrsync.c bdev/lxcrsync.h \
-       bdev/lxczfs.c bdev/lxczfs.h \
-       bdev/storage_utils.c bdev/storage_utils.h \
+       storage/storage.c storage/storage.h \
+       storage/aufs.c storage/aufs.h \
+       storage/btrfs.c storage/btrfs.h \
+       storage/dir.c storage/dir.h \
+       storage/loop.c storage/loop.h \
+       storage/lvm.c storage/lvm.h \
+       storage/nbd.c storage/nbd.h \
+       storage/overlay.c storage/overlay.h \
+       storage/rbd.c storage/rbd.h \
+       storage/rsync.c storage/rsync.h \
+       storage/zfs.c storage/zfs.h \
+       storage/storage_utils.c storage/storage_utils.h \
        cgroups/cgfs.c \
        cgroups/cgfsng.c \
        cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
@@ -162,7 +162,7 @@ AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
        -DSBINDIR=\"$(SBINDIR)\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/lxc \
-       -I $(top_srcdir)/src/lxc/bdev \
+       -I $(top_srcdir)/src/lxc/storage \
        -I $(top_srcdir)/src/lxc/cgroups
 
 if ENABLE_APPARMOR

diff --git a/src/lxc/cgroups/cgfs.c b/src/lxc/cgroups/cgfs.c
index 5b5e0d32bf6fdf1f4f7c5eebe9c9709975fc31e6..066a93a4c314eddfd60b5751d95ff191c931a7b6 100644 (file)
--- a/src/lxc/cgroups/cgfs.c
+++ b/src/lxc/cgroups/cgfs.c
@@ -39,7 +39,6 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
@@ -49,6 +48,7 @@
 #include "cgroup.h"
 #include "start.h"
 #include "state.h"
+#include "storage.h"
 
 #if IS_BIONIC
 #include <../include/lxcmntent.h>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 6f0b21a0b4c00102341a6fb72572be8b38e7b78b..7312ec3c79b7e66717ec302219c3b40beca4914f 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -47,11 +47,11 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "bdev.h"
 #include "cgroup.h"
 #include "cgroup_utils.h"
 #include "commands.h"
 #include "log.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxc_cgfsng, lxc);

diff --git a/src/lxc/cgroups/cgmanager.c b/src/lxc/cgroups/cgmanager.c
index 96b4edba64b0345c695c08f9b11e3edcd92d0664..d8aac891181b7f1791c0be284ef02533e74a9106 100644 (file)
--- a/src/lxc/cgroups/cgmanager.c
+++ b/src/lxc/cgroups/cgmanager.c
@@ -41,7 +41,6 @@
 #include <net/if.h>
 #include <poll.h>
 
-#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
@@ -51,6 +50,7 @@
 #include "cgroup.h"
 #include "start.h"
 #include "state.h"
+#include "storage.h"
 
 #define CGM_SUPPORTS_GET_ABS 3
 #define CGM_SUPPORTS_NAMED 4

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index c2018305d5ea6824633809682358586d5bd3e38d..f4794250ee4a929de3dffeaf874cbb9815b972c5 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -73,20 +73,20 @@
 #endif
 
 #include "af_unix.h"
-#include "bdev.h"
 #include "caps.h"       /* for lxc_caps_last_cap() */
 #include "cgroup.h"
 #include "conf.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "log.h"
-#include "lxcaufs.h"
 #include "lxclock.h"
-#include "lxcoverlay.h"
 #include "lxcseccomp.h"
 #include "namespace.h"
 #include "network.h"
 #include "parse.h"
+#include "storage.h"
+#include "storage/aufs.h"
+#include "storage/overlay.h"
 #include "utils.h"
 #include "lsm/lsm.h"
 

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 67d1478363719d4ee2ade800a19d0c8ce3e79072..9bc3e9bf08e0e08ada5668555b9fe9c0572f6e28 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -38,8 +38,7 @@
 #include <time.h>
 #include <dirent.h>
 
-#include "bdev.h"
-#include "bdev/storage_utils.h"
+#include "storage/storage_utils.h"
 #include "parse.h"
 #include "config.h"
 #include "confile.h"
@@ -49,6 +48,7 @@
 #include "conf.h"
 #include "network.h"
 #include "lxcseccomp.h"
+#include "storage.h"
 
 #if HAVE_SYS_PERSONALITY_H
 #include <sys/personality.h>

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 59403f26f6f1f3edb5f2a79d84dc3edfe8921efc..ab3177f3f067a8ec4b7bbaa015ff9d71fb410272 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -34,7 +34,6 @@
 
 #include "config.h"
 
-#include "bdev.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "commands.h"
@@ -43,6 +42,7 @@
 #include "lxc.h"
 #include "lxclock.h"
 #include "network.h"
+#include "storage.h"
 #include "utils.h"
 
 #if IS_BIONIC

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 900cd9b4aefec618608bd191292abfdad34a3ecb..74fa63a2d3f0f6ad5ef08c96a15005db87064f94 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -40,9 +40,6 @@
 
 #include "af_unix.h"
 #include "attach.h"
-#include "bdev.h"
-#include "lxcoverlay.h"
-#include "lxcbtrfs.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "config.h"
@@ -58,9 +55,12 @@
 #include "monitor.h"
 #include "namespace.h"
 #include "network.h"
-#include "sync.h"
 #include "start.h"
 #include "state.h"
+#include "storage.h"
+#include "storage/btrfs.h"
+#include "storage/overlay.h"
+#include "sync.h"
 #include "utils.h"
 #include "version.h"
 

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 49a94a84097758204b7208b06a6d31640ee03af4..da70d051f5cd718e830fdabf076441143aadb91d 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -55,7 +55,6 @@
 #endif
 
 #include "af_unix.h"
-#include "bdev.h"
 #include "caps.h"
 #include "cgroup.h"
 #include "commands.h"
@@ -72,6 +71,7 @@
 #include "monitor.h"
 #include "namespace.h"
 #include "start.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "sync.h"
 #include "utils.h"

diff --git a/src/lxc/bdev/lxcaufs.c b/src/lxc/storage/aufs.c
similarity index 99%
rename from src/lxc/bdev/lxcaufs.c
rename to src/lxc/storage/aufs.c
index fd5e97503cb9d60eb60ce03c9505376f9c0fd64f..42727e17084f629b9f810ba667678f86be758a44 100644 (file)
--- a/src/lxc/bdev/lxcaufs.c
+++ b/src/lxc/storage/aufs.c
@@ -28,10 +28,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "bdev.h"
+#include "aufs.h"
 #include "log.h"
-#include "lxcaufs.h"
-#include "lxcrsync.h"
+#include "aufs.h"
+#include "rsync.h"
+#include "sync.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxcaufs, lxc);

diff --git a/src/lxc/bdev/lxcaufs.h b/src/lxc/storage/aufs.h
similarity index 100%
rename from src/lxc/bdev/lxcaufs.h
rename to src/lxc/storage/aufs.h

diff --git a/src/lxc/bdev/lxcbtrfs.c b/src/lxc/storage/btrfs.c
similarity index 99%
rename from src/lxc/bdev/lxcbtrfs.c
rename to src/lxc/storage/btrfs.c
index 9eaec4a2a62523030e1a9e204e49dfdf1d1686f6..8f5a7b16b3f32385700eada55f3051129dce9716 100644 (file)
--- a/src/lxc/bdev/lxcbtrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -35,10 +35,10 @@
 #include <sys/types.h>
 #include <sys/vfs.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcbtrfs.h"
-#include "lxcrsync.h"
+#include "btrfs.h"
+#include "rsync.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxcbtrfs, lxc);

diff --git a/src/lxc/bdev/lxcbtrfs.h b/src/lxc/storage/btrfs.h
similarity index 100%
rename from src/lxc/bdev/lxcbtrfs.h
rename to src/lxc/storage/btrfs.h

diff --git a/src/lxc/bdev/lxcdir.c b/src/lxc/storage/dir.c
similarity index 99%
rename from src/lxc/bdev/lxcdir.c
rename to src/lxc/storage/dir.c
index 93359257c9a998d5686beb86c18ba8809514b9f7..0268d37d1f1e7415da1282956e859f94cff9d625 100644 (file)
--- a/src/lxc/bdev/lxcdir.c
+++ b/src/lxc/storage/dir.c
@@ -25,8 +25,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "bdev.h"
 #include "log.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxcdir, lxc);

diff --git a/src/lxc/bdev/lxcdir.h b/src/lxc/storage/dir.h
similarity index 100%
rename from src/lxc/bdev/lxcdir.h
rename to src/lxc/storage/dir.h

diff --git a/src/lxc/bdev/lxcloop.c b/src/lxc/storage/loop.c
similarity index 99%
rename from src/lxc/bdev/lxcloop.c
rename to src/lxc/storage/loop.c
index aa14925fb4535c263e53712e6f91de6d4e7cef36..e1bc8fdd85feba76bc4131834e51c97eea3436f2 100644 (file)
--- a/src/lxc/bdev/lxcloop.c
+++ b/src/lxc/storage/loop.c
@@ -31,9 +31,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcloop.h"
+#include "loop.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/bdev/lxcloop.h b/src/lxc/storage/loop.h
similarity index 100%
rename from src/lxc/bdev/lxcloop.h
rename to src/lxc/storage/loop.h

diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/storage/lvm.c
similarity index 99%
rename from src/lxc/bdev/lxclvm.c
rename to src/lxc/storage/lvm.c
index f62ba92563bcf0dabbc53d8b7cd452f6ec81bc90..e621cbfb57725bf96d0040aab1dc8e4d5476fcc0 100644 (file)
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/storage/lvm.c
@@ -32,10 +32,10 @@
 #include <sys/sysmacros.h>
 #include <sys/wait.h>
 
-#include "bdev.h"
 #include "config.h"
 #include "log.h"
-#include "lxclvm.h"
+#include "lvm.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/bdev/lxclvm.h b/src/lxc/storage/lvm.h
similarity index 100%
rename from src/lxc/bdev/lxclvm.h
rename to src/lxc/storage/lvm.h

diff --git a/src/lxc/bdev/lxcnbd.c b/src/lxc/storage/nbd.c
similarity index 99%
rename from src/lxc/bdev/lxcnbd.c
rename to src/lxc/storage/nbd.c
index 894343df0d6cbdb70d23c2c82df4924cc7a8af52..2ecf6b5eaa35e138e5d303d5d949c8e0b4511f0e 100644 (file)
--- a/src/lxc/bdev/lxcnbd.c
+++ b/src/lxc/storage/nbd.c
@@ -31,9 +31,9 @@
 #include <sys/prctl.h>
 #include <sys/wait.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcnbd.h"
+#include "nbd.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/bdev/lxcnbd.h b/src/lxc/storage/nbd.h
similarity index 100%
rename from src/lxc/bdev/lxcnbd.h
rename to src/lxc/storage/nbd.h

diff --git a/src/lxc/bdev/lxcoverlay.c b/src/lxc/storage/overlay.c
similarity index 99%
rename from src/lxc/bdev/lxcoverlay.c
rename to src/lxc/storage/overlay.c
index 65daed8dbb76434b315bc4b27c0b0f08ef5f8ae0..48a3972b79d876d12da28176a426e43399fb390a 100644 (file)
--- a/src/lxc/bdev/lxcoverlay.c
+++ b/src/lxc/storage/overlay.c
@@ -27,13 +27,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bdev.h"
 #include "conf.h"
 #include "confile.h"
 #include "log.h"
 #include "lxccontainer.h"
-#include "lxcoverlay.h"
-#include "lxcrsync.h"
+#include "overlay.h"
+#include "rsync.h"
+#include "storage.h"
+#include "storage_utils.h"
 #include "utils.h"
 
 lxc_log_define(lxcoverlay, lxc);

diff --git a/src/lxc/bdev/lxcoverlay.h b/src/lxc/storage/overlay.h
similarity index 100%
rename from src/lxc/bdev/lxcoverlay.h
rename to src/lxc/storage/overlay.h

diff --git a/src/lxc/bdev/lxcrbd.c b/src/lxc/storage/rbd.c
similarity index 99%
rename from src/lxc/bdev/lxcrbd.c
rename to src/lxc/storage/rbd.c
index a43600890e4ea7732aa22d77d855662a1aa1b871..11cc2cc7ca9719dd464d09a9f07c63b43c60bf90 100644 (file)
--- a/src/lxc/bdev/lxcrbd.c
+++ b/src/lxc/storage/rbd.c
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bdev.h"
 #include "log.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/bdev/lxcrbd.h b/src/lxc/storage/rbd.h
similarity index 100%
rename from src/lxc/bdev/lxcrbd.h
rename to src/lxc/storage/rbd.h

diff --git a/src/lxc/bdev/lxcrsync.c b/src/lxc/storage/rsync.c
similarity index 98%
rename from src/lxc/bdev/lxcrsync.c
rename to src/lxc/storage/rsync.c
index 8af39898ddda0450b32150c0e104411790a85c47..59f225c5113ac18603820bd43a1e92d33f669672 100644 (file)
--- a/src/lxc/bdev/lxcrsync.c
+++ b/src/lxc/storage/rsync.c
@@ -32,9 +32,9 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcrsync.h"
+#include "rsync.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxcrsync, lxc);

diff --git a/src/lxc/bdev/lxcrsync.h b/src/lxc/storage/rsync.h
similarity index 100%
rename from src/lxc/bdev/lxcrsync.h
rename to src/lxc/storage/rsync.h

diff --git a/src/lxc/bdev/bdev.c b/src/lxc/storage/storage.c
similarity index 98%
rename from src/lxc/bdev/bdev.c
rename to src/lxc/storage/storage.c
index b6bd04a2f949ce7717a4e05207a2f45467e779ab..2fa7119508f24d3d9b6e33b29766461818af0e7e 100644 (file)
--- a/src/lxc/bdev/bdev.c
+++ b/src/lxc/storage/storage.c
@@ -46,33 +46,33 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include "bdev.h"
+#include "aufs.h"
+#include "btrfs.h"
 #include "conf.h"
 #include "config.h"
+#include "dir.h"
 #include "error.h"
 #include "log.h"
+#include "loop.h"
+#include "lvm.h"
 #include "lxc.h"
-#include "lxcaufs.h"
-#include "lxcbtrfs.h"
-#include "lxcdir.h"
 #include "lxclock.h"
-#include "lxclvm.h"
-#include "lxcloop.h"
-#include "lxcnbd.h"
-#include "lxcoverlay.h"
-#include "lxcrbd.h"
-#include "lxcrsync.h"
-#include "lxczfs.h"
+#include "nbd.h"
 #include "namespace.h"
+#include "overlay.h"
 #include "parse.h"
+#include "rbd.h"
+#include "rsync.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
+#include "zfs.h"
 
 #ifndef BLKGETSIZE64
 #define BLKGETSIZE64 _IOR(0x12, 114, size_t)
 #endif
 
-lxc_log_define(bdev, lxc);
+lxc_log_define(storage, lxc);
 
 /* aufs */
 static const struct bdev_ops aufs_ops = {

diff --git a/src/lxc/bdev/bdev.h b/src/lxc/storage/storage.h
similarity index 98%
rename from src/lxc/bdev/bdev.h
rename to src/lxc/storage/storage.h
index b723b5080887fe9ab8783c26bf4ea7aad4e30bd9..49e2ef5795a3d86d1336a113b647975c631e7f64 100644 (file)
--- a/src/lxc/bdev/bdev.h
+++ b/src/lxc/storage/storage.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __LXC_BDEV_H
-#define __LXC_BDEV_H
+#ifndef __LXC_STORAGE_H
+#define __LXC_STORAGE_H
 
 #include "config.h"
 #include <stdint.h>
@@ -126,4 +126,4 @@ bool bdev_destroy(struct lxc_conf *conf);
 int bdev_destroy_wrapper(void *data);
 extern bool rootfs_is_blockdev(struct lxc_conf *conf);
 
-#endif // __LXC_BDEV_H
+#endif // __LXC_STORAGE_H

diff --git a/src/lxc/bdev/storage_utils.c b/src/lxc/storage/storage_utils.c
similarity index 99%
rename from src/lxc/bdev/storage_utils.c
rename to src/lxc/storage/storage_utils.c
index 6ca6b51ece7b6d941d3b0fa5e362c9f90f02c1ed..a903ebd79ddb6d15aba8bb9f60c118a2020d5f31 100644 (file)
--- a/src/lxc/bdev/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -39,10 +39,10 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcnbd.h"
+#include "nbd.h"
 #include "parse.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/bdev/storage_utils.h b/src/lxc/storage/storage_utils.h
similarity index 100%
rename from src/lxc/bdev/storage_utils.h
rename to src/lxc/storage/storage_utils.h

diff --git a/src/lxc/bdev/lxczfs.c b/src/lxc/storage/zfs.c
similarity index 99%
rename from src/lxc/bdev/lxczfs.c
rename to src/lxc/storage/zfs.c
index 64129456088a3dde3861281ae0ce49a4c486e98b..e7fb65427cef2b3d4944c6aa17343d32d6ecb724 100644 (file)
--- a/src/lxc/bdev/lxczfs.c
+++ b/src/lxc/storage/zfs.c
@@ -29,11 +29,11 @@
 #include <unistd.h>
 #include <sys/mount.h>
 
-#include "bdev.h"
 #include "config.h"
 #include "log.h"
-#include "lxczfs.h"
+#include "storage.h"
 #include "utils.h"
+#include "zfs.h"
 
 lxc_log_define(lxczfs, lxc);
 

diff --git a/src/lxc/bdev/lxczfs.h b/src/lxc/storage/zfs.h
similarity index 100%
rename from src/lxc/bdev/lxczfs.h
rename to src/lxc/storage/zfs.h

diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 09e4f02bbbcf6c29dd5df3ab26c327b6ddb7c8ce..d043ea988229e750deb55f17611bd9d56d739631 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -37,13 +37,13 @@
 #include <lxc/lxccontainer.h>
 
 #include "attach.h"
-#include "bdev.h"
 #include "log.h"
 #include "confile.h"
 #include "arguments.h"
 #include "lxc.h"
 #include "conf.h"
 #include "state.h"
+#include "storage.h"
 #include "utils.h"
 
 #ifndef HAVE_GETSUBOPT

diff --git a/src/lxc/tools/lxc_create.c b/src/lxc/tools/lxc_create.c
index ad449dcada2ea8b333bb0672de46f5225bf485d9..555731a487af9f02df4b4f825736a4349af42e32 100644 (file)
--- a/src/lxc/tools/lxc_create.c
+++ b/src/lxc/tools/lxc_create.c
@@ -27,9 +27,9 @@
 #include <sys/types.h>
 
 #include "arguments.h"
-#include "bdev.h"
 #include "log.h"
 #include "lxc.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

diff --git a/src/lxc/tools/lxc_snapshot.c b/src/lxc/tools/lxc_snapshot.c
index 3c7bfade0324ef5c465134736a502ef208309ba6..82269ae387f6fc2f5ed7f1aee2f14956c932d808 100644 (file)
--- a/src/lxc/tools/lxc_snapshot.c
+++ b/src/lxc/tools/lxc_snapshot.c
@@ -27,10 +27,10 @@
 
 #include <lxc/lxccontainer.h>
 
-#include "bdev.h"
 #include "lxc.h"
 #include "log.h"
 #include "arguments.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxc_snapshot_ui, lxc);