shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Additional LVM- prefix matching for transitional period.

Browse Source
This commit is contained in:
Alasdair Kergon 2005-11-12 22:46:48 +00:00
parent 749caf947d
commit 87f98002b5
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.01 - Version 1.02.01 -
============================= =============================
Additional LVM- prefix matching for transitional period.
Version 1.02.00 - 10 Nov 2005 Version 1.02.00 - 10 Nov 2005
============================= =============================

28
libdm/libdm-deptree.c
View File

@ -25,6 +25,9 @@
#define MAX_TARGET_PARAMSIZE 500000 #define MAX_TARGET_PARAMSIZE 500000
/* FIXME Fix interface so this is used only by LVM */
#define UUID_PREFIX "LVM-"
/* Supported segment types */ /* Supported segment types */
enum { enum {
SEG_ERROR, SEG_ERROR,
@ -348,8 +351,15 @@ static struct dm_tree_node *_find_dm_tree_node(struct dm_tree *dtree,
static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree, static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree,
const char *uuid) const char *uuid)
{ {
/* FIXME Do we need to cope with missing LVM- prefix too? */ struct dm_tree_node *node;
return dm_hash_lookup(dtree->uuids, uuid);
if ((node = dm_hash_lookup(dtree->uuids, uuid)))
return node;
if (strncmp(uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
return NULL;
return dm_hash_lookup(dtree->uuids, uuid + sizeof(UUID_PREFIX) - 1);
} }
static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint32_t minor, static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint32_t minor,
@ -653,13 +663,13 @@ static int _uuid_prefix_matches(const char *uuid, const char *uuid_prefix, size_
if (uuid_prefix_len <= 4) if (uuid_prefix_len <= 4)
return 0; return 0;
if (!strncmp(uuid, "LVM-", 4)) if (!strncmp(uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
return 0; return 0;
if (strncmp(uuid_prefix, "LVM-", 4)) if (strncmp(uuid_prefix, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
return 0; return 0;
if (!strncmp(uuid, uuid_prefix + 4, uuid_prefix_len - 4)) if (!strncmp(uuid, uuid_prefix + sizeof(UUID_PREFIX) - 1, uuid_prefix_len - (sizeof(UUID_PREFIX) - 1)))
return 1; return 1;
return 0; return 0;
@ -1026,7 +1036,7 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode,
} }
/* Ignore if it doesn't belong to this VG */ /* Ignore if it doesn't belong to this VG */
if (uuid_prefix && strncmp(uuid, uuid_prefix, uuid_prefix_len)) if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len))
continue; continue;
if (dm_tree_node_num_children(child, 0)) if (dm_tree_node_num_children(child, 0))
@ -1371,8 +1381,8 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
continue; continue;
/* Ignore if it doesn't belong to this VG */ /* Ignore if it doesn't belong to this VG */
if (uuid_prefix && child->info.exists && if (child->info.exists &&
strncmp(child->uuid, uuid_prefix, uuid_prefix_len)) !_uuid_prefix_matches(child->uuid, uuid_prefix, uuid_prefix_len))
continue; continue;
if (dm_tree_node_num_children(child, 0)) if (dm_tree_node_num_children(child, 0))
@ -1435,7 +1445,7 @@ int dm_tree_children_use_uuid(struct dm_tree_node *dnode,
return 1; return 1;
} }
if (!strncmp(uuid, uuid_prefix, uuid_prefix_len)) if (_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len))
return 1; return 1;
if (dm_tree_node_num_children(child, 0)) if (dm_tree_node_num_children(child, 0))