shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-26 17:25:10 +03:00
Code Releases Activity

build: Don't generate symlinks in include/ dir

Browse Source 
As we start refactoring the code to break dependencies (see doc/refactoring.txt),
I want us to use full paths in the includes (eg, #include "base/data-struct/list.h").
This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in
metadata/ from base/
This commit is contained in:
Joe Thornber 2018-05-14 10:30:20 +01:00
parent 02b99be57e
commit 7f97c7ea9a
250 changed files with 915 additions and 1017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -15559,7 +15559,7 @@ _ACEOF
################################################################################
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile"
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile lib/locking/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -16281,7 +16281,6 @@ do
"conf/lvmlocal.conf") CONFIG_FILES="$CONFIG_FILES conf/lvmlocal.conf" ;;
"conf/command_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/command_profile_template.profile" ;;
"conf/metadata_profile_template.profile") CONFIG_FILES="$CONFIG_FILES conf/metadata_profile_template.profile" ;;
"include/.symlinks") CONFIG_FILES="$CONFIG_FILES include/.symlinks" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;;

1
configure.ac
View File

@ -2113,7 +2113,6 @@ conf/example.conf
conf/lvmlocal.conf
conf/command_profile_template.profile
conf/metadata_profile_template.profile
include/.symlinks
include/Makefile
lib/Makefile
lib/locking/Makefile

2
daemons/clvmd/clvmd-cman.c
View File

@ -22,7 +22,7 @@
#include <pthread.h>
#include "clvmd-comms.h"
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd.h"
#include "lvm-functions.h"

6
daemons/clvmd/clvmd-command.c
View File

@ -52,12 +52,12 @@
#include "clvmd-common.h"
#include "clvmd-comms.h"
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd.h"
#include "lvm-globals.h"
#include "lib/misc/lvm-globals.h"
#include "lvm-functions.h"
#include "locking.h"
#include "lib/locking/locking.h"
#include <sys/utsname.h>

4
daemons/clvmd/clvmd-common.h
View File

@ -20,8 +20,8 @@
#define _REENTRANT
#include "tool.h"
#include "tools/tool.h"
#include "lvm-logging.h"
#include "lib/log/lvm-logging.h"
#endif

4
daemons/clvmd/clvmd-corosync.c
View File

@ -21,12 +21,12 @@
#include <pthread.h>
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"
#include "lvm-functions.h"
#include "locking.h"
#include "lib/locking/locking.h"
#include <corosync/cpg.h>
#include <corosync/quorum.h>

4
daemons/clvmd/clvmd-openais.c
View File

@ -29,8 +29,8 @@
#include <corosync/corotypes.h>
#include <corosync/cpg.h>
#include "locking.h"
#include "clvm.h"
#include "lib/locking/locking.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd-comms.h"
#include "lvm-functions.h"
#include "clvmd.h"

4
daemons/clvmd/clvmd-singlenode.c
View File

@ -16,8 +16,8 @@
#include <pthread.h>
#include "locking.h"
#include "clvm.h"
#include "lib/locking/locking.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"

2
daemons/clvmd/clvmd.c
View File

@ -20,7 +20,7 @@
#include "clvmd-common.h"
#include "clvmd-comms.h"
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd.h"
#include "lvm-functions.h"
#include "lvm-version.h"

14
daemons/clvmd/lvm-functions.c
View File

@ -17,18 +17,18 @@
#include <pthread.h>
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"
#include "lvm-functions.h"
/* LVM2 headers */
#include "toolcontext.h"
#include "lvmcache.h"
#include "lvm-globals.h"
#include "activate.h"
#include "archiver.h"
#include "memlock.h"
#include "lib/commands/toolcontext.h"
#include "lib/cache/lvmcache.h"
#include "lib/misc/lvm-globals.h"
#include "lib/activate/activate.h"
#include "lib/format_text/archiver.h"
#include "lib/mm/memlock.h"
#include <syslog.h>

2
daemons/clvmd/refresh_clvmd.c
View File

@ -21,7 +21,7 @@
#include "clvmd-common.h"
#include "clvm.h"
#include "daemons/clvmd/clvm.h"
#include "refresh_clvmd.h"
#include <stddef.h>

2
daemons/cmirrord/cluster.c
View File

@ -16,7 +16,7 @@
#include "functions.h"
#include "link_mon.h"
#include "local.h"
#include "xlate.h"
#include "lib/mm/xlate.h"
#include <corosync/cpg.h>
#include <errno.h>

4
daemons/cmirrord/cluster.h
View File

@ -12,8 +12,8 @@
#ifndef _LVM_CLOG_CLUSTER_H
#define _LVM_CLOG_CLUSTER_H
#include "dm-log-userspace.h"
#include "libdevmapper.h"
#include "libdm/misc/dm-log-userspace.h"
#include "libdm/libdevmapper.h"
#define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */
#define DM_ULOG_CHECKPOINT_READY 21

2
daemons/cmirrord/compat.c
View File

@ -8,7 +8,7 @@
#include "logging.h"
#include "cluster.h"
#include "compat.h"
#include "xlate.h"
#include "lib/mm/xlate.h"
#include <errno.h>

2
daemons/cmirrord/functions.h
View File

@ -12,7 +12,7 @@
#ifndef _LVM_CLOG_FUNCTIONS_H
#define _LVM_CLOG_FUNCTIONS_H
#include "dm-log-userspace.h"
#include "libdm/misc/dm-log-userspace.h"
#include "cluster.h"
#define LOG_RESUMED 1

6
daemons/dmeventd/dmeventd.c
View File

@ -16,12 +16,12 @@
* dmeventd - dm event daemon to monitor active mapped devices
*/
#include "dm-logging.h"
#include "libdm/misc/dm-logging.h"
#include "libdevmapper-event.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include "dmeventd.h"
#include "tool.h"
#include "tools/tool.h"
#include <dlfcn.h>
#include <pthread.h>

6
daemons/dmeventd/libdevmapper-event.c
View File

@ -12,9 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dm-logging.h"
#include "dmlib.h"
#include "libdevmapper-event.h"
#include "libdm/misc/dm-logging.h"
#include "libdm/misc/dmlib.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include "dmeventd.h"
#include <fcntl.h>

6
daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c
View File

@ -12,10 +12,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "dmeventd_lvm.h"
#include "libdevmapper-event.h"
#include "lvm2cmd.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include "tools/lvm2cmd.h"
#include <pthread.h>

6
daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
View File

@ -12,10 +12,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "libdevmapper-event.h"
#include "lib/misc/lib.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include "dmeventd_lvm.h"
#include "activate.h" /* For TARGET_NAME* */
#include "lib/activate/activate.h"
/* FIXME Reformat to 80 char lines. */

6
daemons/dmeventd/plugins/raid/dmeventd_raid.c
View File

@ -12,10 +12,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "defaults.h"
#include "lib/misc/lib.h"
#include "lib/config/defaults.h"
#include "dmeventd_lvm.h"
#include "libdevmapper-event.h"
#include "daemons/dmeventd/libdevmapper-event.h"
/* Hold enough elements for the mximum number of RAID images */
#define RAID_DEVS_ELEMS ((DEFAULT_RAID_MAX_IMAGES + 63) / 64)

4
daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
View File

@ -12,9 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "dmeventd_lvm.h"
#include "libdevmapper-event.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include <sys/sysmacros.h>
#include <sys/wait.h>

6
daemons/dmeventd/plugins/thin/dmeventd_thin.c
View File

@ -12,16 +12,16 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h" /* using here lvm log */
#include "lib/misc/lib.h"
#include "dmeventd_lvm.h"
#include "libdevmapper-event.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include <sys/wait.h>
#include <stdarg.h>
/* TODO - move this mountinfo code into library to be reusable */
#ifdef __linux__
# include "kdev_t.h"
# include "libdm/misc/kdev_t.h"
#else
# define MAJOR(x) major((x))
# define MINOR(x) minor((x))

6
daemons/dmfilemapd/dmfilemapd.c
View File

@ -14,11 +14,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "tool.h"
#include "tools/tool.h"
#include "dm-logging.h"
#include "libdm/misc/dm-logging.h"
#include "defaults.h"
#include "lib/config/defaults.h"
#include <sys/types.h>
#include <sys/stat.h>

4
daemons/lvmetad/lvmetactl.c
View File

@ -8,9 +8,9 @@
* of the GNU Lesser General Public License v.2.1.
*/
#include "tool.h"
#include "tools/tool.h"
#include "lvmetad-client.h"
#include "daemons/lvmetad/lvmetad-client.h"
daemon_handle h;

2
daemons/lvmetad/lvmetad-client.h
View File

@ -15,7 +15,7 @@
#ifndef _LVM_LVMETAD_CLIENT_H
#define _LVM_LVMETAD_CLIENT_H
#include "daemon-client.h"
#include "libdaemon/client/daemon-client.h"
#define LVMETAD_SOCKET DEFAULT_RUN_DIR "/lvmetad.socket"

6
daemons/lvmetad/lvmetad-core.c
View File

@ -16,13 +16,13 @@
#define _REENTRANT
#include "tool.h"
#include "tools/tool.h"
#include "daemon-io.h"
#include "libdaemon/client/daemon-io.h"
#include "daemon-server.h"
#include "daemon-log.h"
#include "lvm-version.h"
#include "lvmetad-client.h"
#include "daemons/lvmetad/lvmetad-client.h"
#include <assert.h>
#include <errno.h>

10
daemons/lvmetad/testclient.c
View File

@ -11,12 +11,12 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "tool.h"
#include "tools/tool.h"
#include "lvmetad-client.h"
#include "label.h"
#include "lvmcache.h"
#include "metadata.h"
#include "daemons/lvmetad/lvmetad-client.h"
#include "lib/label/label.h"
#include "lib/cache/lvmcache.h"
#include "lib/metadata/metadata.h"
const char *uuid1 = "abcd-efgh";
const char *uuid2 = "bbcd-efgh";

4
daemons/lvmlockd/lvmlockctl.c
View File

@ -8,9 +8,9 @@
* of the GNU Lesser General Public License v.2.1.
*/
#include "tool.h"
#include "tools/tool.h"
#include "lvmlockd-client.h"
#include "daemons/lvmlockd/lvmlockd-client.h"
#include <stddef.h>
#include <getopt.h>

2
daemons/lvmlockd/lvmlockd-client.h
View File

@ -11,7 +11,7 @@
#ifndef _LVM_LVMLOCKD_CLIENT_H
#define _LVM_LVMLOCKD_CLIENT_H
#include "daemon-client.h"
#include "libdaemon/client/daemon-client.h"
#define LVMLOCKD_SOCKET DEFAULT_RUN_DIR "/lvmlockd.socket"

10
daemons/lvmlockd/lvmlockd-core.c
View File

@ -12,14 +12,14 @@
#define _ISOC99_SOURCE
#define _REENTRANT
#include "tool.h"
#include "tools/tool.h"
#include "daemon-io.h"
#include "libdaemon/client/daemon-io.h"
#include "daemon-server.h"
#include "lvm-version.h"
#include "lvmetad-client.h"
#include "lvmlockd-client.h"
#include "dm-ioctl.h" /* for DM_UUID_LEN */
#include "daemons/lvmetad/lvmetad-client.h"
#include "daemons/lvmlockd/lvmlockd-client.h"
#include "libdm/misc/dm-ioctl.h"
/* #include <assert.h> */
#include <errno.h>

6
daemons/lvmlockd/lvmlockd-dlm.c
View File

@ -11,13 +11,13 @@
#define _XOPEN_SOURCE 500 /* pthread */
#define _ISOC99_SOURCE
#include "tool.h"
#include "tools/tool.h"
#include "daemon-server.h"
#include "xlate.h"
#include "lib/mm/xlate.h"
#include "lvmlockd-internal.h"
#include "lvmlockd-client.h"
#include "daemons/lvmlockd/lvmlockd-client.h"
/*
* Using synchronous _wait dlm apis so do not define _REENTRANT and

6
daemons/lvmlockd/lvmlockd-sanlock.c
View File

@ -11,13 +11,13 @@
#define _XOPEN_SOURCE 500 /* pthread */
#define _ISOC99_SOURCE
#include "tool.h"
#include "tools/tool.h"
#include "daemon-server.h"
#include "xlate.h"
#include "lib/mm/xlate.h"
#include "lvmlockd-internal.h"
#include "lvmlockd-client.h"
#include "daemons/lvmlockd/lvmlockd-client.h"
#include "sanlock.h"
#include "sanlock_rv.h"

4
daemons/lvmpolld/lvmpolld-common.h
View File

@ -20,10 +20,10 @@
#define _REENTRANT
#include "tool.h"
#include "tools/tool.h"
#include "lvmpolld-cmd-utils.h"
#include "lvmpolld-protocol.h"
#include "daemons/lvmpolld/lvmpolld-protocol.h"
#include <assert.h>
#include <errno.h>

2
daemons/lvmpolld/lvmpolld-data-utils.c
View File

@ -14,7 +14,7 @@
#include "lvmpolld-common.h"
#include "config-util.h"
#include "libdaemon/client/config-util.h"
#include <fcntl.h>
#include <signal.h>

2
daemons/lvmpolld/lvmpolld-protocol.h
View File

@ -15,7 +15,7 @@
#ifndef _LVM_LVMPOLLD_PROTOCOL_H
#define _LVM_LVMPOLLD_PROTOCOL_H
#include "polling_ops.h"
#include "daemons/lvmpolld/polling_ops.h"
#define LVMPOLLD_PROTOCOL "lvmpolld"
#define LVMPOLLD_PROTOCOL_VERSION 1

2
device-mapper/vdo/status.c
View File

@ -1,7 +1,7 @@
#include "target.h"
// For DM_ARRAY_SIZE!
#include "libdevmapper.h"
#include "libdm/libdevmapper.h"
#include <ctype.h>
#include <stdlib.h>

2
doc/example_cmdlib.c
View File

@ -12,7 +12,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lvm2cmd.h"
#include "tools/lvm2cmd.h"
#include <stdio.h>
/* All output gets passed to this function line-by-line */

80
include/.symlinks.in
View File

@ -1,80 +0,0 @@
@top_srcdir@/daemons/clvmd/clvm.h
@top_srcdir@/daemons/dmeventd/libdevmapper-event.h
@top_srcdir@/daemons/lvmetad/lvmetad-client.h
@top_srcdir@/daemons/lvmlockd/lvmlockd-client.h
@top_srcdir@/daemons/lvmpolld/lvmpolld-protocol.h
@top_srcdir@/daemons/lvmpolld/polling_ops.h
@top_srcdir@/lib/activate/activate.h
@top_srcdir@/lib/activate/targets.h
@top_srcdir@/lib/cache/lvmcache.h
@top_srcdir@/lib/cache/lvmetad.h
@top_srcdir@/lib/commands/toolcontext.h
@top_srcdir@/lib/config/config.h
@top_srcdir@/lib/config/config_settings.h
@top_srcdir@/lib/config/defaults.h
@top_srcdir@/lib/datastruct/btree.h
@top_srcdir@/lib/datastruct/str_list.h
@top_srcdir@/lib/device/bcache.h
@top_srcdir@/lib/device/dev-cache.h
@top_srcdir@/lib/device/dev-ext-udev-constants.h
@top_srcdir@/lib/device/dev-type.h
@top_srcdir@/lib/device/device-types.h
@top_srcdir@/lib/device/device.h
@top_srcdir@/lib/display/display.h
@top_srcdir@/lib/filters/filter.h
@top_srcdir@/lib/format1/format1.h
@top_srcdir@/lib/format_pool/format_pool.h
@top_srcdir@/lib/format_text/archiver.h
@top_srcdir@/lib/format_text/format-text.h
@top_srcdir@/lib/format_text/text_export.h
@top_srcdir@/lib/format_text/text_import.h
@top_srcdir@/lib/label/label.h
@top_srcdir@/lib/locking/locking.h
@top_srcdir@/lib/locking/lvmlockd.h
@top_srcdir@/lib/log/log.h
@top_srcdir@/lib/log/lvm-logging.h
@top_srcdir@/lib/lvmpolld/lvmpolld-client.h
@top_srcdir@/lib/lvmpolld/polldaemon.h
@top_srcdir@/lib/metadata/lv.h
@top_srcdir@/lib/metadata/lv_alloc.h
@top_srcdir@/lib/metadata/metadata-exported.h
@top_srcdir@/lib/metadata/metadata.h
@top_srcdir@/lib/metadata/pv.h
@top_srcdir@/lib/metadata/pv_alloc.h
@top_srcdir@/lib/metadata/segtype.h
@top_srcdir@/lib/metadata/vg.h
@top_srcdir@/lib/misc/crc.h
@top_srcdir@/lib/misc/intl.h
@top_srcdir@/lib/misc/last-path-component.h
@top_srcdir@/lib/misc/lib.h
@top_srcdir@/lib/misc/lvm-exec.h
@top_srcdir@/lib/misc/lvm-file.h
@top_srcdir@/lib/misc/lvm-flock.h
@top_srcdir@/lib/misc/lvm-globals.h
@top_srcdir@/lib/misc/lvm-maths.h
@top_srcdir@/lib/misc/lvm-percent.h
@top_srcdir@/lib/misc/lvm-signal.h
@top_srcdir@/lib/misc/lvm-string.h
@top_srcdir@/lib/misc/lvm-wrappers.h
@top_srcdir@/lib/misc/sharedlib.h
@top_srcdir@/lib/misc/util.h
@top_srcdir@/lib/mm/memlock.h
@top_srcdir@/lib/mm/xlate.h
@top_srcdir@/lib/notify/lvmnotify.h
@top_srcdir@/lib/properties/prop_common.h
@top_srcdir@/lib/report/properties.h
@top_srcdir@/lib/report/report.h
@top_srcdir@/lib/uuid/uuid.h
@top_srcdir@/libdaemon/client/config-util.h
@top_srcdir@/libdaemon/client/daemon-client.h
@top_srcdir@/libdaemon/client/daemon-io.h
@top_srcdir@/libdm/libdevmapper.h
@top_srcdir@/libdm/misc/dm-ioctl.h
@top_srcdir@/libdm/misc/dm-log-userspace.h
@top_srcdir@/libdm/misc/dm-logging.h
@top_srcdir@/libdm/misc/dmlib.h
@top_srcdir@/libdm/misc/kdev_t.h
@top_srcdir@/liblvm/lvm2app.h
@top_srcdir@/po/pogen.h
@top_srcdir@/tools/lvm2cmd.h
@top_srcdir@/tools/tool.h

20
include/Makefile.in
View File

@ -18,22 +18,4 @@ top_builddir = @top_builddir@
include $(top_builddir)/make.tmpl
all: .symlinks_created
LINKS := $(shell find . -maxdepth 1 -type l)
.symlinks_created: .symlinks
ifneq (,$(firstword $(LINKS)))
$(RM) $(LINKS)
endif
for i in `cat $<`; do $(LN_S) $$i ; done
touch $@
pofile: all
device-mapper: all
cflow: all
DISTCLEAN_TARGETS += .symlinks configure.h lvm-version.h
CLEAN_TARGETS += $(LINKS) .include_symlinks .symlinks_created
DISTCLEAN_TARGETS += .configure.h lvm-version.h

32
lib/activate/activate.c
View File

@ -13,23 +13,23 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "activate.h"
#include "memlock.h"
#include "display.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "lib/activate/activate.h"
#include "lib/mm/memlock.h"
#include "lib/display/display.h"
#include "fs.h"
#include "lvm-exec.h"
#include "lvm-file.h"
#include "lvm-string.h"
#include "toolcontext.h"
#include "lib/misc/lvm-exec.h"
#include "lib/misc/lvm-file.h"
#include "lib/misc/lvm-string.h"
#include "lib/commands/toolcontext.h"
#include "dev_manager.h"
#include "str_list.h"
#include "config.h"
#include "segtype.h"
#include "sharedlib.h"
#include "lvmcache.h"
#include "metadata.h"
#include "lib/datastruct/str_list.h"
#include "lib/config/config.h"
#include "lib/metadata/segtype.h"
#include "lib/misc/sharedlib.h"
#include "lib/cache/lvmcache.h"
#include "lib/metadata/metadata.h"
#include <limits.h>
#include <fcntl.h>
@ -413,7 +413,7 @@ void fs_unlock(void)
{
}
/* dev_manager.c */
#include "targets.h"
#include "lib/activate/targets.h"
int add_areas_line(struct dev_manager *dm, struct lv_segment *seg,
struct dm_tree_node *node, uint32_t start_area,
uint32_t areas)

2
lib/activate/activate.h
View File

@ -16,7 +16,7 @@
#ifndef LVM_ACTIVATE_H
#define LVM_ACTIVATE_H
#include "metadata-exported.h"
#include "lib/metadata/metadata-exported.h"
struct lvinfo {
int exists;

22
lib/activate/dev_manager.c
View File

@ -13,19 +13,19 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "dev_manager.h"
#include "lvm-string.h"
#include "lib/misc/lvm-string.h"
#include "fs.h"
#include "defaults.h"
#include "segtype.h"
#include "display.h"
#include "toolcontext.h"
#include "targets.h"
#include "config.h"
#include "activate.h"
#include "lvm-exec.h"
#include "str_list.h"
#include "lib/config/defaults.h"
#include "lib/metadata/segtype.h"
#include "lib/display/display.h"
#include "lib/commands/toolcontext.h"
#include "lib/activate/targets.h"
#include "lib/config/config.h"
#include "lib/activate/activate.h"
#include "lib/misc/lvm-exec.h"
#include "lib/datastruct/str_list.h"
#include <limits.h>
#include <dirent.h>

2
lib/activate/dev_manager.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_DEV_MANAGER_H
#define _LVM_DEV_MANAGER_H
#include "metadata-exported.h"
#include "lib/metadata/metadata-exported.h"
struct logical_volume;
struct lv_activate_opts;

12
lib/activate/fs.c
View File

@ -13,13 +13,13 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "fs.h"
#include "activate.h"
#include "toolcontext.h"
#include "lvm-string.h"
#include "lvm-file.h"
#include "memlock.h"
#include "lib/activate/activate.h"
#include "lib/commands/toolcontext.h"
#include "lib/misc/lvm-string.h"
#include "lib/misc/lvm-file.h"
#include "lib/mm/memlock.h"
#include <sys/stat.h>
#include <fcntl.h>

2
lib/activate/fs.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_FS_H
#define _LVM_FS_H
#include "metadata.h"
#include "lib/metadata/metadata.h"
/*
* These calls, private to the activate unit, set

24
lib/cache/lvmcache.c vendored
View File

@ -13,19 +13,19 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lvmcache.h"
#include "toolcontext.h"
#include "dev-cache.h"
#include "locking.h"
#include "metadata.h"
#include "memlock.h"
#include "str_list.h"
#include "format-text.h"
#include "config.h"
#include "lib/misc/lib.h"
#include "lib/cache/lvmcache.h"
#include "lib/commands/toolcontext.h"
#include "lib/device/dev-cache.h"
#include "lib/locking/locking.h"
#include "lib/metadata/metadata.h"
#include "lib/mm/memlock.h"
#include "lib/datastruct/str_list.h"
#include "lib/format_text/format-text.h"
#include "lib/config/config.h"
#include "lvmetad.h"
#include "lvmetad-client.h"
#include "lib/cache/lvmetad.h"
#include "daemons/lvmetad/lvmetad-client.h"
#define CACHE_LOCKED 0x00000002

10
lib/cache/lvmcache.h vendored
View File

@ -16,11 +16,11 @@
#ifndef _LVM_CACHE_H
#define _LVM_CACHE_H
#include "dev-cache.h"
#include "dev-type.h"
#include "uuid.h"
#include "label.h"
#include "locking.h"
#include "lib/device/dev-cache.h"
#include "lib/device/dev-type.h"
#include "lib/uuid/uuid.h"
#include "lib/label/label.h"
#include "lib/locking/locking.h"
#define ORPHAN_PREFIX VG_ORPHANS
#define ORPHAN_VG_NAME(fmt) ORPHAN_PREFIX "_" fmt

24
lib/cache/lvmetad.c vendored
View File

@ -12,18 +12,18 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "toolcontext.h"
#include "metadata.h"
#include "device.h"
#include "lvmetad.h"
#include "lvmcache.h"
#include "lvmetad-client.h"
#include "format-text.h" // TODO for disk_locn, used as a DA representation
#include "crc.h"
#include "lvm-signal.h"
#include "lvmlockd.h"
#include "str_list.h"
#include "lib/misc/lib.h"
#include "lib/commands/toolcontext.h"
#include "lib/metadata/metadata.h"
#include "lib/device/device.h"
#include "lib/cache/lvmetad.h"
#include "lib/cache/lvmcache.h"
#include "daemons/lvmetad/lvmetad-client.h"
#include "lib/format_text/format-text.h"
#include "lib/misc/crc.h"
#include "lib/misc/lvm-signal.h"
#include "lib/locking/lvmlockd.h"
#include "lib/datastruct/str_list.h"
#include <time.h>

2
lib/cache/lvmetad.h vendored
View File

@ -15,7 +15,7 @@
#ifndef _LVM_METAD_H
#define _LVM_METAD_H
#include "config-util.h"
#include "libdaemon/client/config-util.h"
#include <stdint.h>

24
lib/cache_segtype/cache.c
View File

@ -12,18 +12,18 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "toolcontext.h"
#include "segtype.h"
#include "display.h"
#include "text_export.h"
#include "config.h"
#include "str_list.h"
#include "lvm-string.h"
#include "activate.h"
#include "metadata.h"
#include "lv_alloc.h"
#include "defaults.h"
#include "lib/misc/lib.h"
#include "lib/commands/toolcontext.h"
#include "lib/metadata/segtype.h"
#include "lib/display/display.h"
#include "lib/format_text/text_export.h"
#include "lib/config/config.h"
#include "lib/datastruct/str_list.h"
#include "lib/misc/lvm-string.h"
#include "lib/activate/activate.h"
#include "lib/metadata/metadata.h"
#include "lib/metadata/lv_alloc.h"
#include "lib/config/defaults.h"
static const char _cache_module[] = "cache";
#define CACHE_POLICY_WHEN_MISSING "mq"

38
lib/commands/toolcontext.c
View File

@ -13,27 +13,27 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "toolcontext.h"
#include "metadata.h"
#include "defaults.h"
#include "lvm-string.h"
#include "activate.h"
#include "filter.h"
#include "label.h"
#include "lvm-file.h"
#include "format-text.h"
#include "display.h"
#include "memlock.h"
#include "str_list.h"
#include "segtype.h"
#include "lvmcache.h"
#include "lvmetad.h"
#include "archiver.h"
#include "lvmpolld-client.h"
#include "lib/misc/lib.h"
#include "lib/commands/toolcontext.h"
#include "lib/metadata/metadata.h"
#include "lib/config/defaults.h"
#include "lib/misc/lvm-string.h"
#include "lib/activate/activate.h"
#include "lib/filters/filter.h"
#include "lib/label/label.h"
#include "lib/misc/lvm-file.h"
#include "lib/format_text/format-text.h"
#include "lib/display/display.h"
#include "lib/mm/memlock.h"
#include "lib/datastruct/str_list.h"
#include "lib/metadata/segtype.h"
#include "lib/cache/lvmcache.h"
#include "lib/cache/lvmetad.h"
#include "lib/format_text/archiver.h"
#include "lib/lvmpolld/lvmpolld-client.h"
#ifdef HAVE_LIBDL
#include "sharedlib.h"
#include "lib/misc/sharedlib.h"
#endif
#include <locale.h>

4
lib/commands/toolcontext.h
View File

@ -16,8 +16,8 @@
#ifndef _LVM_TOOLCONTEXT_H
#define _LVM_TOOLCONTEXT_H
#include "dev-cache.h"
#include "dev-type.h"
#include "lib/device/dev-cache.h"
#include "lib/device/dev-type.h"
#include <limits.h>

20
lib/config/config.c
View File

@ -14,16 +14,16 @@
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "config.h"
#include "crc.h"
#include "device.h"
#include "str_list.h"
#include "toolcontext.h"
#include "lvm-file.h"
#include "memlock.h"
#include "label.h"
#include "lib/config/config.h"
#include "lib/misc/crc.h"
#include "lib/device/device.h"
#include "lib/datastruct/str_list.h"
#include "lib/commands/toolcontext.h"
#include "lib/misc/lvm-file.h"
#include "lib/mm/memlock.h"
#include "lib/label/label.h"
#include <sys/stat.h>
#include <sys/mman.h>
@ -71,7 +71,7 @@ static struct cfg_def_item _cfg_def_items[CFG_COUNT + 1] = {
#define cfg_runtime(id, name, parent, flags, type, since_version, deprecated_since_version, deprecation_comment, comment) {id, parent, name, type, {.fn_##type = get_default_##id}, (flags) | CFG_DEFAULT_RUN_TIME, since_version, {.fn_UNCONFIGURED = get_default_unconfigured_##id}, deprecated_since_version, (deprecation_comment), comment},
#define cfg_array(id, name, parent, flags, types, default_value, since_version, unconfigured_value, deprecated_since_version, deprecation_comment, comment) {id, parent, name, CFG_TYPE_ARRAY | (types), {.v_CFG_TYPE_STRING = (default_value)}, (flags), (since_version), {.v_UNCONFIGURED = (unconfigured_value)}, deprecated_since_version, deprecation_comment, comment},
#define cfg_array_runtime(id, name, parent, flags, types, since_version, deprecated_since_version, deprecation_comment, comment) {id, parent, name, CFG_TYPE_ARRAY | (types), {.fn_CFG_TYPE_STRING = get_default_##id}, (flags) | CFG_DEFAULT_RUN_TIME, (since_version), {.fn_UNCONFIGURED = get_default_unconfigured_##id}, deprecated_since_version, deprecation_comment, comment},
#include "config_settings.h"
#include "lib/config/config_settings.h"
#undef cfg_section
#undef cfg
#undef cfg_runtime

6
lib/config/config.h
View File

@ -16,8 +16,8 @@
#ifndef _LVM_CONFIG_H
#define _LVM_CONFIG_H
#include "libdevmapper.h"
#include "device.h"
#include "libdm/libdevmapper.h"
#include "lib/device/device.h"
/* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */
/* FIXME Max LVM version supported: 7.15.511. Extend bits when needed. */
@ -196,7 +196,7 @@ enum {
#define cfg_runtime(id, name, parent, flags, type, since_version, deprecated_since_version, deprecation_comment, comment) id,
#define cfg_array(id, name, parent, flags, types, default_value, since_version, unconfigured_value, deprecated_since_version, deprecation_comment, comment) id,
#define cfg_array_runtime(id, name, parent, flags, types, since_version, deprecated_since_version, deprecation_comment, comment) id,
#include "config_settings.h"
#include "lib/config/config_settings.h"
#undef cfg_section
#undef cfg
#undef cfg_runtime

2
lib/config/config_settings.h
View File

@ -117,7 +117,7 @@
* default values, the new defaults are used by LVM unless
* the previous default value was set (uncommented) in lvm.conf.
*/
#include "defaults.h"
#include "lib/config/defaults.h"
cfg_section(root_CFG_SECTION, "(root)", root_CFG_SECTION, 0, vsn(0, 0, 0), 0, NULL, NULL)

4
lib/datastruct/btree.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "btree.h"
#include "lib/misc/lib.h"
#include "lib/datastruct/btree.h"
struct node {
uint32_t key;

4
lib/datastruct/str_list.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "str_list.h"
#include "lib/misc/lib.h"
#include "lib/datastruct/str_list.h"
struct dm_list *str_list_create(struct dm_pool *mem)
{

2
lib/device/bcache-utils.c
View File

@ -12,7 +12,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bcache.h"
#include "lib/device/bcache.h"
// FIXME: need to define this in a common place (that doesn't pull in deps)
#ifndef SECTOR_SHIFT

6
lib/device/bcache.c
View File

@ -14,9 +14,9 @@
#define _GNU_SOURCE
#include "bcache.h"
#include "dm-logging.h"
#include "log.h"
#include "lib/device/bcache.h"
#include "libdm/misc/dm-logging.h"
#include "lib/log/log.h"
#include <errno.h>
#include <fcntl.h>

2
lib/device/bcache.h
View File

@ -15,7 +15,7 @@
#ifndef BCACHE_H
#define BCACHE_H
#include "libdevmapper.h"
#include "libdm/libdevmapper.h"
#include <linux/fs.h>
#include <stdint.h>

12
lib/device/dev-cache.c
View File

@ -13,12 +13,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "btree.h"
#include "config.h"
#include "toolcontext.h"
#include "dm-ioctl.h" /* for DM_UUID_LEN */
#include "lvm-string.h" /* for LVM's UUID_PREFIX */
#include "lib/misc/lib.h"
#include "lib/datastruct/btree.h"
#include "lib/config/config.h"
#include "lib/commands/toolcontext.h"
#include "libdm/misc/dm-ioctl.h"
#include "lib/misc/lvm-string.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>

4
lib/device/dev-cache.h
View File

@ -16,8 +16,8 @@
#ifndef _LVM_DEV_CACHE_H
#define _LVM_DEV_CACHE_H
#include "device.h"
#include "lvm-wrappers.h"
#include "lib/device/device.h"
#include "lib/misc/lvm-wrappers.h"
/*
* predicate for devices.

6
lib/device/dev-dasd.c
View File

@ -12,9 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "dev-type.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "lib/device/dev-type.h"
#include <sys/ioctl.h>
#ifdef __linux__

4
lib/device/dev-ext.c
View File

@ -12,8 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "device.h"
#include "lib/misc/lib.h"
#include "lib/device/device.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>

12
lib/device/dev-io.c
View File

@ -13,12 +13,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "device.h"
#include "metadata.h"
#include "lvmcache.h"
#include "memlock.h"
#include "locking.h"
#include "lib/misc/lib.h"
#include "lib/device/device.h"
#include "lib/metadata/metadata.h"
#include "lib/cache/lvmcache.h"
#include "lib/mm/memlock.h"
#include "lib/locking/locking.h"
#include <limits.h>
#include <sys/stat.h>

4
lib/device/dev-luks.c
View File

@ -12,8 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "dev-type.h"
#include "lib/misc/lib.h"
#include "lib/device/dev-type.h"
#define LUKS_SIGNATURE "LUKS\xba\xbe"
#define LUKS_SIGNATURE_SIZE 6

6
lib/device/dev-lvm1-pool.c
View File

@ -12,9 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "dev-type.h"
#include "xlate.h"
#include "lib/misc/lib.h"
#include "lib/device/dev-type.h"
#include "lib/mm/xlate.h"
/*
* These lvm1 structs just used NAME_LEN in the previous format1 lvm2 code, but

8
lib/device/dev-md.c
View File

@ -13,12 +13,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "dev-type.h"
#include "xlate.h"
#include "lib/misc/lib.h"
#include "lib/device/dev-type.h"
#include "lib/mm/xlate.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h> /* for MD detection using udev db records */
#include "dev-ext-udev-constants.h"
#include "lib/device/dev-ext-udev-constants.h"
#endif
#ifdef __linux__

4
lib/device/dev-swap.c
View File

@ -12,8 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "dev-type.h"
#include "lib/misc/lib.h"
#include "lib/device/dev-type.h"
#ifdef __linux__

18
lib/device/dev-type.c
View File

@ -12,13 +12,13 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "dev-type.h"
#include "xlate.h"
#include "config.h"
#include "metadata.h"
#include "bcache.h"
#include "label.h"
#include "lib/misc/lib.h"
#include "lib/device/dev-type.h"
#include "lib/mm/xlate.h"
#include "lib/config/config.h"
#include "lib/metadata/metadata.h"
#include "lib/device/bcache.h"
#include "lib/label/label.h"
#include <libgen.h>
#include <ctype.h>
@ -29,10 +29,10 @@
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>
#include "dev-ext-udev-constants.h"
#include "lib/device/dev-ext-udev-constants.h"
#endif
#include "device-types.h"
#include "lib/device/device-types.h"
struct dev_types *create_dev_types(const char *proc_dir,
const struct dm_config_node *cn)

8
lib/device/dev-type.h
View File

@ -15,14 +15,14 @@
#ifndef _LVM_DEV_TYPE_H
#define _LVM_DEV_TYPE_H
#include "device.h"
#include "display.h"
#include "label.h"
#include "lib/device/device.h"
#include "lib/display/display.h"
#include "lib/label/label.h"
#define NUMBER_OF_MAJORS 4096
#ifdef __linux__
# include "kdev_t.h"
# include "libdm/misc/kdev_t.h"
#else
# define MAJOR(x) major((x))
# define MINOR(x) minor((x))

2
lib/device/device.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_DEVICE_H
#define _LVM_DEVICE_H
#include "uuid.h"
#include "lib/uuid/uuid.h"
#include <fcntl.h>

16
lib/display/display.c
View File

@ -13,14 +13,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "display.h"
#include "activate.h"
#include "toolcontext.h"
#include "segtype.h"
#include "defaults.h"
#include "lvm-signal.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "lib/display/display.h"
#include "lib/activate/activate.h"
#include "lib/commands/toolcontext.h"
#include "lib/metadata/segtype.h"
#include "lib/config/defaults.h"
#include "lib/misc/lvm-signal.h"
#include <stdarg.h>

6
lib/display/display.h
View File

@ -16,9 +16,9 @@
#ifndef _LVM_DISPLAY_H
#define _LVM_DISPLAY_H
#include "metadata-exported.h"
#include "locking.h"
#include "lvm-string.h"
#include "lib/metadata/metadata-exported.h"
#include "lib/locking/locking.h"
#include "lib/misc/lvm-string.h"
#include <stdint.h>

16
lib/error/errseg.c
View File

@ -12,14 +12,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "toolcontext.h"
#include "segtype.h"
#include "display.h"
#include "config.h"
#include "str_list.h"
#include "activate.h"
#include "str_list.h"
#include "lib/misc/lib.h"
#include "lib/commands/toolcontext.h"
#include "lib/metadata/segtype.h"
#include "lib/display/display.h"
#include "lib/config/config.h"
#include "lib/datastruct/str_list.h"
#include "lib/activate/activate.h"
#include "lib/datastruct/str_list.h"
static int _errseg_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2)
{

6
lib/filters/filter-composite.c
View File

@ -13,9 +13,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "device.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#include "lib/device/device.h"
static int _and_p(struct dev_filter *f, struct device *dev)
{

6
lib/filters/filter-fwraid.c
View File

@ -12,12 +12,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>
#include "dev-ext-udev-constants.h"
#include "lib/device/dev-ext-udev-constants.h"
#endif
#ifdef __linux__

4
lib/filters/filter-internal.c
View File

@ -12,8 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
static DM_LIST_INIT(_allow_devs);

4
lib/filters/filter-md.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#ifdef __linux__

8
lib/filters/filter-mpath.c
View File

@ -12,12 +12,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "activate.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#include "lib/activate/activate.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>
#include "dev-ext-udev-constants.h"
#include "lib/device/dev-ext-udev-constants.h"
#endif
#ifdef __linux__

4
lib/filters/filter-partitioned.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#define MSG_SKIPPING "%s: Skipping: Partition table signature found"

8
lib/filters/filter-persistent.c
View File

@ -13,10 +13,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "config.h"
#include "lvm-file.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#include "lib/config/config.h"
#include "lib/misc/lvm-file.h"
struct pfilter {
char *file;

4
lib/filters/filter-regex.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
struct rfilter {
struct dm_pool *mem;

4
lib/filters/filter-signature.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#ifdef __linux__

4
lib/filters/filter-sysfs.c
View File

@ -12,8 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#ifdef __linux__

4
lib/filters/filter-type.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
static int _passes_lvm_type_device_filter(struct dev_filter *f, struct device *dev)
{

8
lib/filters/filter-usable.c
View File

@ -12,12 +12,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "filter.h"
#include "activate.h" /* device_is_usable */
#include "lib/misc/lib.h"
#include "lib/filters/filter.h"
#include "lib/activate/activate.h"
#ifdef UDEV_SYNC_SUPPORT
#include <libudev.h>
#include "dev-ext-udev-constants.h"
#include "lib/device/dev-ext-udev-constants.h"
#endif
static const char *_too_small_to_hold_pv_msg = "Too small to hold a PV";

4
lib/filters/filter.h
View File

@ -17,8 +17,8 @@
#ifndef _LVM_FILTER_H
#define _LVM_FILTER_H
#include "dev-cache.h"
#include "dev-type.h"
#include "lib/device/dev-cache.h"
#include "lib/device/dev-type.h"
struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct dev_filter **filters);

12
lib/format_text/archive.c
View File

@ -13,14 +13,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "format-text.h"
#include "lib/misc/lib.h"
#include "lib/format_text/format-text.h"
#include "config.h"
#include "lib/config/config.h"
#include "import-export.h"
#include "lvm-string.h"
#include "lvm-file.h"
#include "toolcontext.h"
#include "lib/misc/lvm-string.h"
#include "lib/misc/lvm-file.h"
#include "lib/commands/toolcontext.h"
#include <dirent.h>
#include <unistd.h>

18
lib/format_text/archiver.c
View File

@ -13,15 +13,15 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "archiver.h"
#include "format-text.h"
#include "lvm-string.h"
#include "lvmcache.h"
#include "lvmetad.h"
#include "memlock.h"
#include "toolcontext.h"
#include "locking.h"
#include "lib/misc/lib.h"
#include "lib/format_text/archiver.h"
#include "lib/format_text/format-text.h"
#include "lib/misc/lvm-string.h"
#include "lib/cache/lvmcache.h"
#include "lib/cache/lvmetad.h"
#include "lib/mm/memlock.h"
#include "lib/commands/toolcontext.h"
#include "lib/locking/locking.h"
#include <unistd.h>

2
lib/format_text/archiver.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_TOOL_ARCHIVE_H
#define _LVM_TOOL_ARCHIVE_H
#include "metadata-exported.h"
#include "lib/metadata/metadata-exported.h"
/*
* There are two operations that come under the general area of

16
lib/format_text/export.c
View File

@ -13,16 +13,16 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "lib/misc/lib.h"
#include "import-export.h"
#include "metadata.h"
#include "display.h"
#include "lvm-string.h"
#include "segtype.h"
#include "text_export.h"
#include "lib/metadata/metadata.h"
#include "lib/display/display.h"
#include "lib/misc/lvm-string.h"
#include "lib/metadata/segtype.h"
#include "lib/format_text/text_export.h"
#include "lvm-version.h"
#include "toolcontext.h"
#include "config-util.h"
#include "lib/commands/toolcontext.h"
#include "libdaemon/client/config-util.h"
#include <stdarg.h>
#include <time.h>

6
lib/format_text/flags.c
View File

@ -13,10 +13,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "import-export.h"
#include "lvm-string.h"
#include "lib/misc/lvm-string.h"
/*
* Bitsets held in the 'status' flags get

30
lib/format_text/format-text.c
View File

@ -13,23 +13,23 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "format-text.h"
#include "lib/misc/lib.h"
#include "lib/format_text/format-text.h"
#include "import-export.h"
#include "device.h"
#include "lvm-file.h"
#include "config.h"
#include "display.h"
#include "toolcontext.h"
#include "lvm-string.h"
#include "uuid.h"
#include "lib/device/device.h"
#include "lib/misc/lvm-file.h"
#include "lib/config/config.h"
#include "lib/display/display.h"
#include "lib/commands/toolcontext.h"
#include "lib/misc/lvm-string.h"
#include "lib/uuid/uuid.h"
#include "layout.h"
#include "crc.h"
#include "xlate.h"
#include "label.h"
#include "lvmcache.h"
#include "lvmetad.h"
#include "memlock.h"
#include "lib/misc/crc.h"
#include "lib/mm/xlate.h"
#include "lib/label/label.h"
#include "lib/cache/lvmcache.h"
#include "lib/cache/lvmetad.h"
#include "lib/mm/memlock.h"
#include <unistd.h>
#include <sys/param.h>

2
lib/format_text/format-text.h
View File

@ -16,7 +16,7 @@
#ifndef _LVM_FORMAT_TEXT_H
#define _LVM_FORMAT_TEXT_H
#include "metadata.h"
#include "lib/metadata/metadata.h"
#define FMT_TEXT_NAME "lvm2"
#define FMT_TEXT_ALIAS "text"

6
lib/format_text/import-export.h
View File

@ -16,9 +16,9 @@
#ifndef _LVM_TEXT_IMPORT_EXPORT_H
#define _LVM_TEXT_IMPORT_EXPORT_H
#include "config.h"
#include "metadata.h"
#include "lvmcache.h"
#include "lib/config/config.h"
#include "lib/metadata/metadata.h"
#include "lib/cache/lvmcache.h"
#include <stdio.h>

4
lib/format_text/import.c
View File

@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "import-export.h"
/* FIXME Use tidier inclusion method */

26
lib/format_text/import_vsn1.c
View File

@ -13,20 +13,20 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "metadata.h"
#include "lib/misc/lib.h"
#include "lib/metadata/metadata.h"
#include "import-export.h"
#include "display.h"
#include "toolcontext.h"
#include "lvmcache.h"
#include "lvmetad.h"
#include "lvmlockd.h"
#include "lv_alloc.h"
#include "pv_alloc.h"
#include "segtype.h"
#include "text_import.h"
#include "defaults.h"
#include "str_list.h"
#include "lib/display/display.h"
#include "lib/commands/toolcontext.h"
#include "lib/cache/lvmcache.h"
#include "lib/cache/lvmetad.h"
#include "lib/locking/lvmlockd.h"
#include "lib/metadata/lv_alloc.h"
#include "lib/metadata/pv_alloc.h"
#include "lib/metadata/segtype.h"
#include "lib/format_text/text_import.h"
#include "lib/config/defaults.h"
#include "lib/datastruct/str_list.h"
typedef int (*section_fn) (struct format_instance * fid,
struct volume_group * vg, const struct dm_config_node * pvn,

8
lib/format_text/layout.h
View File

@ -16,10 +16,10 @@
#ifndef _LVM_TEXT_LAYOUT_H
#define _LVM_TEXT_LAYOUT_H
#include "config.h"
#include "metadata.h"
#include "lvmcache.h"
#include "uuid.h"
#include "lib/config/config.h"
#include "lib/metadata/metadata.h"
#include "lib/cache/lvmcache.h"
#include "lib/uuid/uuid.h"
/* disk_locn and data_area_list are defined in format-text.h */

10
lib/format_text/text_label.c
View File

@ -13,12 +13,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib.h"
#include "format-text.h"
#include "lib/misc/lib.h"
#include "lib/format_text/format-text.h"
#include "layout.h"
#include "label.h"
#include "xlate.h"
#include "lvmcache.h"
#include "lib/label/label.h"
#include "lib/mm/xlate.h"
#include "lib/cache/lvmcache.h"
#include <sys/stat.h>
#include <fcntl.h>

Some files were not shown because too many files have changed in this diff Show More