summaryrefslogtreecommitdiffstats
path: root/lib/error/errseg.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2005-10-16 23:03:59 +0000
committerAlasdair Kergon <agk@redhat.com>2005-10-16 23:03:59 +0000
commit2262b32057a7a60b3de3876b26b192fa4d05205c (patch)
treee2593b67101f9e681cf3a9a5dafedb58c23c661a /lib/error/errseg.c
parenta3f6b2ce798cf738c4e8bf510f86ebd45815842c (diff)
downloadlvm2-2262b32057a7a60b3de3876b26b192fa4d05205c.tar.gz
lvm2-2262b32057a7a60b3de3876b26b192fa4d05205c.tar.xz
lvm2-2262b32057a7a60b3de3876b26b192fa4d05205c.zip
Use hash, bitset, malloc, pool from libdevmapper.
Diffstat (limited to 'lib/error/errseg.c')
-rw-r--r--lib/error/errseg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/error/errseg.c b/lib/error/errseg.c
index 303c39a0..906d1df1 100644
--- a/lib/error/errseg.c
+++ b/lib/error/errseg.c
@@ -13,8 +13,6 @@
*/
#include "lib.h"
-#include "pool.h"
-#include "list.h"
#include "toolcontext.h"
#include "segtype.h"
#include "display.h"
@@ -40,7 +38,7 @@ static int _merge_segments(struct lv_segment *seg1, struct lv_segment *seg2)
}
#ifdef DEVMAPPER_SUPPORT
-static int _compose_target_line(struct dev_manager *dm, struct pool *mem,
+static int _compose_target_line(struct dev_manager *dm, struct dm_pool *mem,
struct config_tree *cft, void **target_state,
struct lv_segment *seg, char *params,
size_t paramsize, const char **target, int *pos,
@@ -69,7 +67,7 @@ static int _target_present(void)
static void _destroy(const struct segment_type *segtype)
{
- dbg_free((void *) segtype);
+ dm_free((void *) segtype);
}
static struct segtype_handler _error_ops = {
@@ -84,7 +82,7 @@ static struct segtype_handler _error_ops = {
struct segment_type *init_error_segtype(struct cmd_context *cmd)
{
- struct segment_type *segtype = dbg_malloc(sizeof(*segtype));
+ struct segment_type *segtype = dm_malloc(sizeof(*segtype));
if (!segtype) {
stack;