From: Christian Brauner Date: Sat, 29 Jul 2017 14:16:33 +0000 (+0200) Subject: storage: rename files "bdev" -> "storage" X-Git-Tag: lxc-2.1.0~32^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d832c4e43d16e85f2dfc376ddea1d0fd88c418;p=thirdparty%2Flxc.git storage: rename files "bdev" -> "storage" Signed-off-by: Christian Brauner --- diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index a55103ec5..9ccf077a1 100644 --- 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 5b5e0d32b..066a93a4c 100644 --- a/src/lxc/cgroups/cgfs.c +++ b/src/lxc/cgroups/cgfs.c @@ -39,7 +39,6 @@ #include #include -#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 bcbf43111..5e131683f 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -50,11 +50,11 @@ #include #include -#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 96b4edba6..d8aac8911 100644 --- a/src/lxc/cgroups/cgmanager.c +++ b/src/lxc/cgroups/cgmanager.c @@ -41,7 +41,6 @@ #include #include -#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 317b4e8d6..a54a7c26c 100644 --- 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 858341952..4a9dfc5d8 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -41,7 +41,6 @@ #include #include -#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 diff --git a/src/lxc/confile_legacy.c b/src/lxc/confile_legacy.c index e97bd87ac..5dddfe139 100644 --- a/src/lxc/confile_legacy.c +++ b/src/lxc/confile_legacy.c @@ -41,7 +41,6 @@ #include #include -#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 diff --git a/src/lxc/criu.c b/src/lxc/criu.c index b1ab5d46e..6b3cb42e8 100644 --- 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 4c00187f4..a0389d617 100644 --- 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 9fa208f2b..c2be74606 100644 --- 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 a2122f236..4efcc8e73 100644 --- a/src/lxc/bdev/lxcaufs.c +++ b/src/lxc/storage/aufs.c @@ -28,10 +28,10 @@ #include #include -#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 0a3404279..189c307ca 100644 --- a/src/lxc/bdev/lxcbtrfs.c +++ b/src/lxc/storage/btrfs.c @@ -36,11 +36,11 @@ #include #include -#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 5b73df658..bca8cda4a 100644 --- a/src/lxc/bdev/lxcdir.c +++ b/src/lxc/storage/dir.c @@ -25,8 +25,8 @@ #include #include -#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 7508cb62e..95cf856bc 100644 --- a/src/lxc/bdev/lxcloop.c +++ b/src/lxc/storage/loop.c @@ -34,9 +34,9 @@ #include #include -#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 0ed2446eb..67d83f71c 100644 --- a/src/lxc/bdev/lxclvm.c +++ b/src/lxc/storage/lvm.c @@ -32,11 +32,11 @@ #include #include -#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 2c419527c..2a76143fc 100644 --- a/src/lxc/bdev/lxcnbd.c +++ b/src/lxc/storage/nbd.c @@ -31,9 +31,9 @@ #include #include -#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 02868c88f..ec57a6719 100644 --- a/src/lxc/bdev/lxcoverlay.c +++ b/src/lxc/storage/overlay.c @@ -27,13 +27,13 @@ #include #include -#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 3c2904e6e..03e28d1ec 100644 --- a/src/lxc/bdev/lxcrbd.c +++ b/src/lxc/storage/rbd.c @@ -29,8 +29,8 @@ #include #include -#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 ce2b5ae88..a3b0dd709 100644 --- a/src/lxc/bdev/lxcrsync.c +++ b/src/lxc/storage/rsync.c @@ -32,9 +32,9 @@ #include #include -#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 a405e88c3..609ff52fd 100644 --- a/src/lxc/bdev/bdev.c +++ b/src/lxc/storage/storage.c @@ -46,33 +46,33 @@ #include #include -#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 509c7f16c..36cf0e646 100644 --- 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 @@ -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 5e3f1fc3b..8b92725bb 100644 --- a/src/lxc/bdev/storage_utils.c +++ b/src/lxc/storage/storage_utils.c @@ -39,10 +39,10 @@ #include #include -#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 0389a831c..014899b5e 100644 --- a/src/lxc/bdev/lxczfs.c +++ b/src/lxc/storage/zfs.c @@ -30,13 +30,13 @@ #include #include -#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 d884e5906..63bf2f59e 100644 --- a/src/lxc/tools/lxc_copy.c +++ b/src/lxc/tools/lxc_copy.c @@ -37,13 +37,13 @@ #include #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 ad449dcad..555731a48 100644 --- a/src/lxc/tools/lxc_create.c +++ b/src/lxc/tools/lxc_create.c @@ -27,9 +27,9 @@ #include #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 3c7bfade0..82269ae38 100644 --- a/src/lxc/tools/lxc_snapshot.c +++ b/src/lxc/tools/lxc_snapshot.c @@ -27,10 +27,10 @@ #include -#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);