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 a55103ec5b61b713db808de0c14f916d4c84c33a..9ccf077a1ff936e29759187bf111c7ca508b8724 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 \
@@ -77,18 +77,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 \
@@ -170,7 +170,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 bcbf431112474a9e856ce866a4dea82bc35bfb88..5e131683f0f866114974221eb83bbc9955dd901d 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -50,11 +50,11 @@
 #include <linux/types.h>
 #include <linux/kdev_t.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 317b4e8d60796454258b2ff032b8d95c65274a85..a54a7c26c7e81de0ffbdce0d18468659b0be86ab 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 8583419524a507fbea2b514d22d11b03ebb12e88..4a9dfc5d8032be082b8fa4bea2c533c1d3b8bbe7 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -41,7 +41,6 @@
 #include <dirent.h>
 #include <syslog.h>
 
-#include "bdev.h"
 #include "parse.h"
 #include "config.h"
 #include "confile.h"
@@ -52,6 +51,7 @@
 #include "conf.h"
 #include "network.h"
 #include "lxcseccomp.h"
+#include "storage.h"
 
 #if HAVE_IFADDRS_H
 #include <ifaddrs.h>

diff --git a/src/lxc/confile_legacy.c b/src/lxc/confile_legacy.c
index e97bd87acc6534ff9f72511ae85ab30c218bc6f5..5dddfe139166db0eeb06e15a46a0b45272f712f5 100644 (file)
--- a/src/lxc/confile_legacy.c
+++ b/src/lxc/confile_legacy.c
@@ -41,7 +41,6 @@
 #include <dirent.h>
 #include <syslog.h>
 
-#include "bdev.h"
 #include "parse.h"
 #include "config.h"
 #include "confile.h"
@@ -52,6 +51,7 @@
 #include "conf.h"
 #include "network.h"
 #include "lxcseccomp.h"
+#include "storage.h"
 
 #if HAVE_IFADDRS_H
 #include <ifaddrs.h>

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index b1ab5d46e5453813e60782834259653fe34067cc..6b3cb42e83f576bc948a0115ac7fac40dc428d4e 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 4c00187f4d432473ae3128b0cbc273e9cbc4b5af..a0389d617011cde41cd84e3a6d525b1d4d93c0ca 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"
@@ -60,9 +57,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 9fa208f2bc2042e46bdbb117d15948ae2da26660..c2be74606f69c37e43eefb35292c280ac1a5ff19 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -63,7 +63,6 @@
 #endif
 
 #include "af_unix.h"
-#include "bdev.h"
 #include "caps.h"
 #include "cgroup.h"
 #include "commands.h"
@@ -80,6 +79,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 a2122f236dc72d1440d8fa1ee4d97cc191e3a6fd..4efcc8e73f075539efd4f0b46ff85076f82d6790 100644 (file)
--- a/src/lxc/bdev/lxcaufs.c
+++ b/src/lxc/storage/aufs.c
@@ -28,10 +28,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "bdev.h"
+#include "aufs.h"
 #include "log.h"
-#include "lxcaufs.h"
-#include "lxcrsync.h"
+#include "rsync.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 0a34042796a6d8070970d7d729671ef83db079da..189c307caea9f6597eddcc08ac139857f103b0c0 100644 (file)
--- a/src/lxc/bdev/lxcbtrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -36,11 +36,11 @@
 #include <sys/types.h>
 #include <sys/vfs.h>
 
-#include "bdev.h"
 #include "log.h"
-#include "lxcbtrfs.h"
-#include "lxcrsync.h"
-#include "../utils.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 5b73df6587bbf5c8288b90392d1b949ba772bbc0..bca8cda4a1c71ead1f4dee3e29e813b10565d0de 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 7508cb62ed8ccee6689f830effe7540d4cdf3b95..95cf856bc684a2053c46b61086a201623cadaf4c 100644 (file)
--- a/src/lxc/bdev/lxcloop.c
+++ b/src/lxc/storage/loop.c
@@ -34,9 +34,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 0ed2446eb525fa72cf1f8b0af504dd447098a1a5..67d83f71c5262a76a09340bcf6ec35189bdc5c4c 100644 (file)
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/storage/lvm.c
@@ -32,11 +32,11 @@
 #include <sys/sysmacros.h>
 #include <sys/wait.h>
 
-#include "bdev.h"
 #include "config.h"
 #include "log.h"
-#include "lxclvm.h"
-#include "lxcrsync.h"
+#include "lvm.h"
+#include "rsync.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 2c419527c32b53d789e6782c0d614591eb4952b8..2a76143fc50e7664806706e114fbd7a64e468a81 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 02868c88fdaf6e64979f9d4d72372345b7d76733..ec57a67191a3ac1cdfc125c757415e8a68ead790 100644 (file)
--- a/src/lxc/bdev/lxcoverlay.c
+++ b/src/lxc/storage/overlay.c
@@ -27,13 +27,13 @@
 #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"
 

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 3c2904e6e6965344548b07578a02299e4aafb6f4..03e28d1ec6ac8a1e85b2be5c400149222593bcba 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 99%
rename from src/lxc/bdev/lxcrsync.c
rename to src/lxc/storage/rsync.c
index ce2b5ae883f930d82cccf8645f7580d6d3f20684..a3b0dd709849e03defa138425ec506e63029581d 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 a405e88c336e358d27b87755260e2b87cce737fa..609ff52fd096191066e5eda7c0c0d0bbca52420f 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 97%
rename from src/lxc/bdev/bdev.h
rename to src/lxc/storage/storage.h
index 509c7f16ca6febf71e297cf9c1715c2afe7d2f3d..36cf0e6467b1ae9bbcc4f259a69d2d8c002500dd 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>
@@ -131,4 +131,4 @@ int bdev_destroy_wrapper(void *data);
 extern bool rootfs_is_blockdev(struct lxc_conf *conf);
 extern char *lxc_storage_get_path(char *src, const char *prefix);
 
-#endif // __LXC_BDEV_H
+#endif /* #define __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 5e3f1fc3b078a0a4e904dd9c07053dfde6d0fd25..8b92725bb501cd383a1960a07cca14e9f6df6ad5 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 0389a831c4f7b5008729329b0a59641a9b3baa10..014899b5ee9527b157b967f969d36cd0d6c6e9f4 100644 (file)
--- a/src/lxc/bdev/lxczfs.c
+++ b/src/lxc/storage/zfs.c
@@ -30,13 +30,13 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "bdev.h"
 #include "config.h"
 #include "log.h"
-#include "lxcrsync.h"
-#include "lxczfs.h"
 #include "parse.h"
+#include "rsync.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 d884e590677724d54692c833cfc82d2dbf2f00aa..63bf2f59e22fde255d281b19158b29cf3e62ed9c 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);