diff --git a/WHATS_NEW b/WHATS_NEW index 83fe0dc64..f605e5efc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.00.24 - ===================================== + Rename old segtypes files to segtype. Some fixes to memory debugging code. Exclude internal commands formats & segtypes from install. diff --git a/include/.symlinks b/include/.symlinks index 54d27bc6a..723f8a10c 100644 --- a/include/.symlinks +++ b/include/.symlinks @@ -31,7 +31,7 @@ ../lib/log/log.h ../lib/metadata/lv_alloc.h ../lib/metadata/metadata.h -../lib/metadata/segtypes.h +../lib/metadata/segtype.h ../lib/mm/dbg_malloc.h ../lib/mm/memlock.h ../lib/mm/pool.h diff --git a/lib/Makefile.in b/lib/Makefile.in index 75ff735b9..026b7b1bc 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -70,7 +70,7 @@ SOURCES =\ metadata/metadata.c \ metadata/mirror.c \ metadata/pv_map.c \ - metadata/segtypes.c \ + metadata/segtype.c \ metadata/snapshot_manip.c \ misc/crc.c \ misc/lvm-file.c \ diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index f6fb683bd..6d3165827 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -21,7 +21,7 @@ #include "lvm-string.h" #include "fs.h" #include "defaults.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "toolcontext.h" #include "targets.h" diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 3610f08eb..2619f90e7 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -33,7 +33,7 @@ #include "display.h" #include "memlock.h" #include "str_list.h" -#include "segtypes.h" +#include "segtype.h" #include "lvmcache.h" #ifdef HAVE_LIBDL diff --git a/lib/display/display.c b/lib/display/display.c index 5da2ddc1a..08e2dc95d 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -18,7 +18,7 @@ #include "display.h" #include "activate.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #define SIZE_BUF 128 diff --git a/lib/error/errseg.c b/lib/error/errseg.c index a71d2a0e4..303c39a00 100644 --- a/lib/error/errseg.c +++ b/lib/error/errseg.c @@ -16,7 +16,7 @@ #include "pool.h" #include "list.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "text_export.h" #include "text_import.h" diff --git a/lib/format1/format1.c b/lib/format1/format1.c index 1fbeda01a..60041c79a 100644 --- a/lib/format1/format1.c +++ b/lib/format1/format1.c @@ -24,7 +24,7 @@ #include "lvmcache.h" #include "lvm1-label.h" #include "format1.h" -#include "segtypes.h" +#include "segtype.h" #define FMT_LVM1_NAME "lvm1" diff --git a/lib/format1/import-export.c b/lib/format1/import-export.c index 7217794a1..92719c6e4 100644 --- a/lib/format1/import-export.c +++ b/lib/format1/import-export.c @@ -25,7 +25,7 @@ #include "lvm-string.h" #include "filter.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #include diff --git a/lib/format1/import-extents.c b/lib/format1/import-extents.c index 93225f5bb..f2287f924 100644 --- a/lib/format1/import-extents.c +++ b/lib/format1/import-extents.c @@ -20,7 +20,7 @@ #include "disk-rep.h" #include "lv_alloc.h" #include "display.h" -#include "segtypes.h" +#include "segtype.h" /* * After much thought I have decided it is easier, diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c index 8df67939a..58be67302 100644 --- a/lib/format_pool/import_export.c +++ b/lib/format_pool/import_export.c @@ -22,7 +22,7 @@ #include "lv_alloc.h" #include "str_list.h" #include "display.h" -#include "segtypes.h" +#include "segtype.h" /* This file contains only imports at the moment... */ diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 2bc168c8d..f1e6710fa 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -20,7 +20,7 @@ #include "pool.h" #include "display.h" #include "lvm-string.h" -#include "segtypes.h" +#include "segtype.h" #include "text_export.h" #include diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c index cccf448a7..cd254c673 100644 --- a/lib/format_text/import_vsn1.c +++ b/lib/format_text/import_vsn1.c @@ -22,7 +22,7 @@ #include "toolcontext.h" #include "lvmcache.h" #include "lv_alloc.h" -#include "segtypes.h" +#include "segtype.h" #include "text_import.h" typedef int (*section_fn) (struct format_instance * fid, struct pool * mem, diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 8d649b5fd..a95b588ee 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -21,7 +21,7 @@ #include "toolcontext.h" #include "lv_alloc.h" #include "display.h" -#include "segtypes.h" +#include "segtype.h" /* * These functions adjust the pe counts in pv's diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 61b05eb60..b7cc6457d 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -18,7 +18,7 @@ #include "toolcontext.h" #include "lv_alloc.h" #include "str_list.h" -#include "segtypes.h" +#include "segtype.h" /* * Attempt to merge two adjacent segments. diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index cf76dea0b..3e6fb064e 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -16,7 +16,7 @@ #include "lib.h" #include "metadata.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "activate.h" diff --git a/lib/metadata/segtypes.c b/lib/metadata/segtype.c similarity index 97% rename from lib/metadata/segtypes.c rename to lib/metadata/segtype.c index 0024e29ce..b60d81d81 100644 --- a/lib/metadata/segtypes.c +++ b/lib/metadata/segtype.c @@ -15,7 +15,7 @@ #include "lib.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" struct segment_type *get_segtype_from_string(struct cmd_context *cmd, const char *str) diff --git a/lib/metadata/segtypes.h b/lib/metadata/segtype.h similarity index 96% rename from lib/metadata/segtypes.h rename to lib/metadata/segtype.h index ef606e52e..4af48b926 100644 --- a/lib/metadata/segtypes.h +++ b/lib/metadata/segtype.h @@ -85,4 +85,8 @@ struct segment_type *init_snapshot_segtype(struct cmd_context *cmd); struct segment_type *init_mirrored_segtype(struct cmd_context *cmd); #endif +#ifdef CRYPT_INTERNAL +struct segment_type *init_crypt_segtype(struct cmd_context *cmd); +#endif + #endif diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index e56041da7..c47a3dda4 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -18,7 +18,7 @@ #include "list.h" #include "toolcontext.h" #include "metadata.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "text_export.h" #include "text_import.h" diff --git a/lib/report/report.c b/lib/report/report.c index e448eff21..9085ff1c0 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -21,7 +21,7 @@ #include "lvm-string.h" #include "display.h" #include "activate.h" -#include "segtypes.h" +#include "segtype.h" /* * For macro use diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index b446026ca..82e8a27e2 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -18,7 +18,7 @@ #include "list.h" #include "toolcontext.h" #include "metadata.h" -#include "segtypes.h" +#include "segtype.h" #include "text_export.h" #include "config.h" #include "activate.h" diff --git a/lib/striped/striped.c b/lib/striped/striped.c index 79a3f1bb3..ccd369d38 100644 --- a/lib/striped/striped.c +++ b/lib/striped/striped.c @@ -17,7 +17,7 @@ #include "pool.h" #include "list.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "text_export.h" #include "text_import.h" diff --git a/lib/zero/zero.c b/lib/zero/zero.c index 962bf3e4b..5524ea87d 100644 --- a/lib/zero/zero.c +++ b/lib/zero/zero.c @@ -16,7 +16,7 @@ #include "pool.h" #include "list.h" #include "toolcontext.h" -#include "segtypes.h" +#include "segtype.h" #include "display.h" #include "text_export.h" #include "text_import.h" diff --git a/tools/tools.h b/tools/tools.h index acab0380e..24ac70044 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -43,7 +43,7 @@ #include "lvm-file.h" #include "lvm-string.h" #include "pool.h" -#include "segtypes.h" +#include "segtype.h" #include "str_list.h" #include "toolcontext.h" #include "toollib.h"