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

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

src/lxc/Makefile.am

@@ -6,18 +6,18 @@ pkginclude_HEADERS = \
 noinst_HEADERS = \
 	arguments.h \
 	attach.h \
-	bdev/bdev.h \
+	storage/storage.h \
-	bdev/lxcaufs.h \
+	storage/aufs.h \
-	bdev/lxcbtrfs.h \
+	storage/btrfs.h \
-	bdev/lxcdir.h \
+	storage/dir.h \
-	bdev/lxcloop.h \
+	storage/loop.h \
-	bdev/lxclvm.h \
+	storage/lvm.h \
-	bdev/lxcnbd.h \
+	storage/nbd.h \
-	bdev/lxcoverlay.h \
+	storage/overlay.h \
-	bdev/lxcrbd.h \
+	storage/rbd.h \
-	bdev/lxcrsync.h \
+	storage/rsync.h \
-	bdev/lxczfs.h \
+	storage/zfs.h \
-	bdev/storage_utils.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 \
+	storage/storage.c storage/storage.h \
-	bdev/lxcaufs.c bdev/lxcaufs.h \
+	storage/aufs.c storage/aufs.h \
-	bdev/lxcbtrfs.c bdev/lxcbtrfs.h \
+	storage/btrfs.c storage/btrfs.h \
-	bdev/lxcdir.c bdev/lxcdir.h \
+	storage/dir.c storage/dir.h \
-	bdev/lxcloop.c bdev/lxcloop.h \
+	storage/loop.c storage/loop.h \
-	bdev/lxclvm.c bdev/lxclvm.h \
+	storage/lvm.c storage/lvm.h \
-	bdev/lxcnbd.c bdev/lxcnbd.h \
+	storage/nbd.c storage/nbd.h \
-	bdev/lxcoverlay.c bdev/lxcoverlay.h \
+	storage/overlay.c storage/overlay.h \
-	bdev/lxcrbd.c bdev/lxcrbd.h \
+	storage/rbd.c storage/rbd.h \
-	bdev/lxcrsync.c bdev/lxcrsync.h \
+	storage/rsync.c storage/rsync.h \
-	bdev/lxczfs.c bdev/lxczfs.h \
+	storage/zfs.c storage/zfs.h \
-	bdev/storage_utils.c bdev/storage_utils.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

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>

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

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

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"
 

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>

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>

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

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"
 

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"

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 "rsync.h"
-#include "lxcrsync.h"
+#include "storage.h"
 #include "utils.h"
 
 lxc_log_define(lxcaufs, lxc);

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 "btrfs.h"
-#include "lxcrsync.h"
+#include "rsync.h"
-#include "../utils.h"
+#include "storage.h"
+#include "utils.h"
 
 lxc_log_define(lxcbtrfs, lxc);
 

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

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"
 

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 "lvm.h"
-#include "lxcrsync.h"
+#include "rsync.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

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"
 

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 "overlay.h"
-#include "lxcrsync.h"
+#include "rsync.h"
+#include "storage.h"
 #include "storage_utils.h"
 #include "utils.h"
 

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"
 

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

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 "nbd.h"
-#include "lxcloop.h"
-#include "lxcnbd.h"
-#include "lxcoverlay.h"
-#include "lxcrbd.h"
-#include "lxcrsync.h"
-#include "lxczfs.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 = {

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
+#ifndef __LXC_STORAGE_H
-#define __LXC_BDEV_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 */

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"
 

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

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

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"
 

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