Skip to content

L
lxc
Unverified Commit d3459849 by Christian Brauner Committed by Stéphane Graber
Options

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

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 789edffe
Showing with 83 additions and 80 deletions
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
......
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
......@@ -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);
......
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
......@@ -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>
......
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"
......@@ -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"
......
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"
......
src/lxc/bdev/lxcaufs.c → 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);
......
src/lxc/bdev/lxcbtrfs.c → 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);
......
src/lxc/bdev/lxcdir.c → 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/bdev/lxcloop.c → 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"
......
src/lxc/bdev/lxclvm.c → 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"
......
src/lxc/bdev/lxcnbd.c → 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/bdev/lxcoverlay.c → 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);
......
src/lxc/bdev/lxcrbd.c → 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/bdev/lxcrsync.c → 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/bdev/bdev.c → 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 = {
......
src/lxc/bdev/bdev.h → 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
src/lxc/bdev/storage_utils.c → 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/bdev/lxczfs.c → 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);
......
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment