Skip to content

Fix for older libdevmapper + other reliability fixes. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lonewasp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for older libdevmapper + other reliability fixes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876d4a9
Fix for older libdevmapper + other reliability fixes.
lonewasp Sep 11, 2013
d13ae27
Check for dm_task_retry_remove corrected.
lonewasp Sep 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ PKG_CHECK_MODULES([UUID], [uuid],

PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.0],
[
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $DEVMAPPER_CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[#include <libdevmapper.h>]], [[dm_task_retry_remove(NULL);]])],
[DEVMAPPER_CFLAGS="$DEVMAPPER_CFLAGS -DHAVE_DM_TASK_RETRY_REMOVE"])
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"
AC_SUBST([DEVMAPPER_CFLAGS])
AC_SUBST([DEVMAPPER_LIBS])
]
Expand Down
28 changes: 15 additions & 13 deletions src/ldm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ ldm_disk_group_finalize(GObject * const object)
{
LDMDiskGroup *dg = LDM_DISK_GROUP(object);

g_free(dg->priv->name); dg->priv->name = NULL;
if (dg->priv->name) { g_free(dg->priv->name); dg->priv->name = NULL; }
}

static void
Expand Down Expand Up @@ -561,11 +561,11 @@ ldm_volume_finalize(GObject * const object)
LDMVolume * const vol_o = LDM_VOLUME(object);
LDMVolumePrivate * const vol = vol_o->priv;

g_free(vol->name); vol->name = NULL;
g_free(vol->dgname); vol->dgname = NULL;
g_free(vol->id1); vol->id1 = NULL;
g_free(vol->id2); vol->id2 = NULL;
g_free(vol->hint); vol->hint = NULL;
if (vol->name) { g_free(vol->name); vol->name = NULL; }
if (vol->dgname) { g_free(vol->dgname); vol->dgname = NULL; }
if (vol->id1) { g_free(vol->id1); vol->id1 = NULL; }
if (vol->id2) { g_free(vol->id2); vol->id2 = NULL; }
if (vol->hint) { g_free(vol->hint); vol->hint = NULL; }
}

static void
Expand Down Expand Up @@ -784,7 +784,7 @@ ldm_partition_finalize(GObject * const object)
LDMPartition * const part_o = LDM_PARTITION(object);
LDMPartitionPrivate * const part = part_o->priv;

g_free(part->name); part->name = NULL;
if (part->name) { g_free(part->name); part->name = NULL; }
}

static void
Expand Down Expand Up @@ -935,9 +935,9 @@ ldm_disk_finalize(GObject * const object)
LDMDisk * const disk_o = LDM_DISK(object);
LDMDiskPrivate * const disk = disk_o->priv;

g_free(disk->name); disk->name = NULL;
g_free(disk->dgname); disk->dgname = NULL;
g_free(disk->device); disk->device = NULL;
if (disk->name) { g_free(disk->name); disk->name = NULL; }
if (disk->dgname) { g_free(disk->dgname); disk->dgname = NULL; }
if (disk->device) { g_free(disk->device); disk->device = NULL; }
}

static void
Expand Down Expand Up @@ -2548,7 +2548,9 @@ _dm_remove(const gchar * const name, uint32_t udev_cookie, GError ** const err)

/* If a remove operation fails, try again in case it was only opened
* transiently. */
#ifdef HAVE_DM_TASK_RETRY_REMOVE
dm_task_retry_remove(task);
#endif

if (!dm_task_run(task)) {
if (_dm_err_last_errno == EBUSY) {
Expand Down Expand Up @@ -2614,7 +2616,7 @@ _dm_create_part(const LDMPartitionPrivate * const part, uint32_t cookie,
static GString *
_dm_create_spanned(const LDMVolumePrivate * const vol, GError ** const err)
{
static GString *name = NULL;
GString *name = NULL;
guint i = 0;
struct dm_target *targets = g_malloc(sizeof(*targets) * vol->parts->len);

Expand Down Expand Up @@ -2681,7 +2683,7 @@ _dm_create_spanned(const LDMVolumePrivate * const vol, GError ** const err)
static GString *
_dm_create_striped(const LDMVolumePrivate * const vol, GError ** const err)
{
static GString *name = NULL;
GString *name = NULL;
struct dm_target target;

target.start = 0;
Expand Down Expand Up @@ -2955,12 +2957,12 @@ ldm_volume_dm_create(const LDMVolume * const o, GString **created,

GString *name = _dm_vol_name(vol);
struct dm_tree_node *node = _find_device_tree_node(tree, name->str);
g_string_free(name, TRUE); name = NULL;
if (node) {
dm_tree_free(tree); tree = NULL;
return TRUE;
}
dm_tree_free(tree); tree = NULL;
g_string_free(name, TRUE);

switch (vol->type) {
case LDM_VOLUME_TYPE_SIMPLE:
Expand Down