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

cope with null uuid_prefix

Browse Source
This commit is contained in:
Alasdair Kergon 2005-10-18 13:57:11 +00:00
parent 0c5a80f6f0
commit a6d97ede7b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdm/libdevmapper.h
View File

@ -247,7 +247,8 @@ const struct dm_info *dm_deptree_node_get_info(struct deptree_node *node);
int dm_deptree_node_num_children(struct deptree_node *node, uint32_t inverted); int dm_deptree_node_num_children(struct deptree_node *node, uint32_t inverted);
/* /*
* Deactivate a device with its dependencies if the uuid prefix matches * Deactivate a device plus all dependencies.
* Ignores devices that don't have a uuid starting with uuid_prefix.
*/ */
int dm_deptree_deactivate_children(struct deptree_node *dnode, int dm_deptree_deactivate_children(struct deptree_node *dnode,
const char *uuid_prefix, const char *uuid_prefix,

8
libdm/libdm-deptree.c
View File

@ -400,7 +400,7 @@ struct deptree_node *dm_deptree_next_child(void **handle,
} }
/* /*
* Deactivate a device with its dependencies if the uuid prefix matches * Deactivate a device with its dependencies if the uuid prefix matches.
*/ */
static int _info_by_dev(uint32_t major, uint32_t minor, struct dm_info *info) static int _info_by_dev(uint32_t major, uint32_t minor, struct dm_info *info)
{ {
@ -454,7 +454,9 @@ static int _deactivate_node(const char *name, uint32_t major, uint32_t minor)
return r; return r;
} }
int dm_deptree_deactivate_children(struct deptree_node *dnode, const char *uuid_prefix, size_t uuid_prefix_len) int dm_deptree_deactivate_children(struct deptree_node *dnode,
const char *uuid_prefix,
size_t uuid_prefix_len)
{ {
void *handle = NULL; void *handle = NULL;
struct deptree_node *child = dnode; struct deptree_node *child = dnode;
@ -480,7 +482,7 @@ int dm_deptree_deactivate_children(struct deptree_node *dnode, const char *uuid_
} }
/* Ignore if it doesn't belong to this VG */ /* Ignore if it doesn't belong to this VG */
if (strncmp(uuid, uuid_prefix, uuid_prefix_len)) if (uuid_prefix && strncmp(uuid, uuid_prefix, uuid_prefix_len))
continue; continue;
/* Refresh open_count */ /* Refresh open_count */