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

Use udev flags support in LVM and provide dm_tree_add_new_dev_with_udev_flags wrapper for dm_tree_add_new_dev.

Browse Source
This commit is contained in:
Peter Rajnoha 2009-10-22 13:00:07 +00:00
parent 5f1f31f942
commit f16aea9ebd
5 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.54 - Version 2.02.54 -
===================================== =====================================
Use udev flags support in LVM.
Delay announcing mirror monitoring to syslog until initialisation succeeded. Delay announcing mirror monitoring to syslog until initialisation succeeded.
Handle metadata with unknown segment types more gracefully. Handle metadata with unknown segment types more gracefully.
Set default owner and group to null. Set default owner and group to null.

13
lib/activate/dev_manager.c
View File

@ -1003,6 +1003,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
uint32_t max_stripe_size = UINT32_C(0); uint32_t max_stripe_size = UINT32_C(0);
uint32_t read_ahead = lv->read_ahead; uint32_t read_ahead = lv->read_ahead;
uint32_t read_ahead_flags = UINT32_C(0); uint32_t read_ahead_flags = UINT32_C(0);
uint16_t udev_flags = 0;
if (!(name = build_dm_name(dm->mem, lv->vg->name, lv->name, layer))) if (!(name = build_dm_name(dm->mem, lv->vg->name, lv->name, layer)))
return_0; return_0;
@ -1022,18 +1023,26 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
lvlayer->lv = lv; lvlayer->lv = lv;
if (layer || !lv_is_visible(lv))
udev_flags |= DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG |
DM_UDEV_DISABLE_DISK_RULES_FLAG;
if (lv_is_cow(lv))
udev_flags |= DM_UDEV_LOW_PRIORITY_FLAG;
/* /*
* Add LV to dtree. * Add LV to dtree.
* If we're working with precommitted metadata, clear any * If we're working with precommitted metadata, clear any
* existing inactive table left behind. * existing inactive table left behind.
* Major/minor settings only apply to the visible layer. * Major/minor settings only apply to the visible layer.
*/ */
if (!(dnode = dm_tree_add_new_dev(dtree, name, dlid, if (!(dnode = dm_tree_add_new_dev_with_udev_flags(dtree, name, dlid,
layer ? UINT32_C(0) : (uint32_t) lv->major, layer ? UINT32_C(0) : (uint32_t) lv->major,
layer ? UINT32_C(0) : (uint32_t) lv->minor, layer ? UINT32_C(0) : (uint32_t) lv->minor,
_read_only_lv(lv), _read_only_lv(lv),
(lv->vg->status & PRECOMMITTED) ? 1 : 0, (lv->vg->status & PRECOMMITTED) ? 1 : 0,
lvlayer))) lvlayer,
udev_flags)))
return_0; return_0;
/* Store existing name so we can do rename later */ /* Store existing name so we can do rename later */

1
libdm/.exported_symbols
View File

@ -50,6 +50,7 @@ dm_tree_create
dm_tree_free dm_tree_free
dm_tree_add_dev dm_tree_add_dev
dm_tree_add_new_dev dm_tree_add_new_dev
dm_tree_add_new_dev_with_udev_flags
dm_tree_node_get_name dm_tree_node_get_name
dm_tree_node_get_uuid dm_tree_node_get_uuid
dm_tree_node_get_info dm_tree_node_get_info

9
libdm/libdevmapper.h
View File

@ -277,6 +277,15 @@ struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *tree,
int read_only, int read_only,
int clear_inactive, int clear_inactive,
void *context); void *context);
struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *tree,
const char *name,
const char *uuid,
uint32_t major,
uint32_t minor,
int read_only,
int clear_inactive,
void *context,
uint16_t udev_flags);
/* /*
* Search for a node in the tree. * Search for a node in the tree.

59
libdm/libdm-deptree.c
View File

@ -130,6 +130,8 @@ struct dm_tree_node {
int activation_priority; /* 0 gets activated first */ int activation_priority; /* 0 gets activated first */
uint16_t udev_flags; /* Udev control flags */
void *context; /* External supplied context */ void *context; /* External supplied context */
struct load_properties props; /* For creation/table (re)load */ struct load_properties props; /* For creation/table (re)load */
@ -301,7 +303,8 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
const char *name, const char *name,
const char *uuid, const char *uuid,
struct dm_info *info, struct dm_info *info,
void *context) void *context,
uint16_t udev_flags)
{ {
struct dm_tree_node *node; struct dm_tree_node *node;
uint64_t dev; uint64_t dev;
@ -317,6 +320,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
node->uuid = uuid; node->uuid = uuid;
node->info = *info; node->info = *info;
node->context = context; node->context = context;
node->udev_flags = udev_flags;
node->activation_priority = 0; node->activation_priority = 0;
dm_list_init(&node->uses); dm_list_init(&node->uses);
@ -466,8 +470,8 @@ static struct dm_tree_node *_add_dev(struct dm_tree *dtree,
if (!_deps(&dmt, dtree->mem, major, minor, &name, &uuid, &info, &deps)) if (!_deps(&dmt, dtree->mem, major, minor, &name, &uuid, &info, &deps))
return_NULL; return_NULL;
if (!(node = _create_dm_tree_node(dtree, name, uuid, if (!(node = _create_dm_tree_node(dtree, name, uuid, &info,
&info, NULL))) NULL, 0)))
goto_out; goto_out;
new = 1; new = 1;
} }
@ -585,8 +589,8 @@ struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *dtree,
info.inactive_table = 0; info.inactive_table = 0;
info.read_only = 0; info.read_only = 0;
if (!(dnode = _create_dm_tree_node(dtree, name2, uuid2, if (!(dnode = _create_dm_tree_node(dtree, name2, uuid2, &info,
&info, context))) context, 0)))
return_NULL; return_NULL;
/* Attach to root node until a table is supplied */ /* Attach to root node until a table is supplied */
@ -613,10 +617,31 @@ struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *dtree,
return_NULL; return_NULL;
dnode->context = context; dnode->context = context;
dnode->udev_flags = 0;
return dnode; return dnode;
} }
struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree,
const char *name,
const char *uuid,
uint32_t major,
uint32_t minor,
int read_only,
int clear_inactive,
void *context,
uint16_t udev_flags)
{
struct dm_tree_node *node;
if ((node = dm_tree_add_new_dev(dtree, name, uuid, major, minor, read_only,
clear_inactive, context)))
node->udev_flags = udev_flags;
return node;
}
void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode, void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode,
uint32_t read_ahead, uint32_t read_ahead,
uint32_t read_ahead_flags) uint32_t read_ahead_flags)
@ -821,7 +846,8 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
return r; return r;
} }
static int _deactivate_node(const char *name, uint32_t major, uint32_t minor, uint32_t *cookie) static int _deactivate_node(const char *name, uint32_t major, uint32_t minor,
uint32_t *cookie, uint16_t udev_flags)
{ {
struct dm_task *dmt; struct dm_task *dmt;
int r = 0; int r = 0;
@ -841,7 +867,7 @@ static int _deactivate_node(const char *name, uint32_t major, uint32_t minor, ui
if (!dm_task_no_open_count(dmt)) if (!dm_task_no_open_count(dmt))
log_error("Failed to disable open_count"); log_error("Failed to disable open_count");
if (!dm_task_set_cookie(dmt, cookie, 0)) if (!dm_task_set_cookie(dmt, cookie, udev_flags))
goto out; goto out;
r = dm_task_run(dmt); r = dm_task_run(dmt);
@ -858,7 +884,7 @@ out:
} }
static int _rename_node(const char *old_name, const char *new_name, uint32_t major, static int _rename_node(const char *old_name, const char *new_name, uint32_t major,
uint32_t minor, uint32_t *cookie) uint32_t minor, uint32_t *cookie, uint16_t udev_flags)
{ {
struct dm_task *dmt; struct dm_task *dmt;
int r = 0; int r = 0;
@ -881,7 +907,7 @@ static int _rename_node(const char *old_name, const char *new_name, uint32_t maj
if (!dm_task_no_open_count(dmt)) if (!dm_task_no_open_count(dmt))
log_error("Failed to disable open_count"); log_error("Failed to disable open_count");
if (!dm_task_set_cookie(dmt, cookie, 0)) if (!dm_task_set_cookie(dmt, cookie, udev_flags))
goto out; goto out;
r = dm_task_run(dmt); r = dm_task_run(dmt);
@ -895,7 +921,8 @@ out:
/* FIXME Merge with _suspend_node? */ /* FIXME Merge with _suspend_node? */
static int _resume_node(const char *name, uint32_t major, uint32_t minor, static int _resume_node(const char *name, uint32_t major, uint32_t minor,
uint32_t read_ahead, uint32_t read_ahead_flags, uint32_t read_ahead, uint32_t read_ahead_flags,
struct dm_info *newinfo, uint32_t *cookie) struct dm_info *newinfo, uint32_t *cookie,
uint16_t udev_flags)
{ {
struct dm_task *dmt; struct dm_task *dmt;
int r = 0; int r = 0;
@ -924,7 +951,7 @@ static int _resume_node(const char *name, uint32_t major, uint32_t minor,
if (!dm_task_set_read_ahead(dmt, read_ahead, read_ahead_flags)) if (!dm_task_set_read_ahead(dmt, read_ahead, read_ahead_flags))
log_error("Failed to set read ahead"); log_error("Failed to set read ahead");
if (!dm_task_set_cookie(dmt, cookie, 0)) if (!dm_task_set_cookie(dmt, cookie, udev_flags))
goto out; goto out;
if ((r = dm_task_run(dmt))) if ((r = dm_task_run(dmt)))
@ -1011,7 +1038,8 @@ int dm_tree_deactivate_children(struct dm_tree_node *dnode,
!info.exists || info.open_count) !info.exists || info.open_count)
continue; continue;
if (!_deactivate_node(name, info.major, info.minor, &dnode->dtree->cookie)) { if (!_deactivate_node(name, info.major, info.minor,
&dnode->dtree->cookie, dnode->udev_flags)) {
log_error("Unable to deactivate %s (%" PRIu32 log_error("Unable to deactivate %s (%" PRIu32
":%" PRIu32 ")", name, info.major, ":%" PRIu32 ")", name, info.major,
info.minor); info.minor);
@ -1156,7 +1184,8 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
/* Rename? */ /* Rename? */
if (child->props.new_name) { if (child->props.new_name) {
if (!_rename_node(name, child->props.new_name, child->info.major, if (!_rename_node(name, child->props.new_name, child->info.major,
child->info.minor, &child->dtree->cookie)) { child->info.minor, &child->dtree->cookie,
child->udev_flags)) {
log_error("Failed to rename %s (%" PRIu32 log_error("Failed to rename %s (%" PRIu32
":%" PRIu32 ") to %s", name, child->info.major, ":%" PRIu32 ") to %s", name, child->info.major,
child->info.minor, child->props.new_name); child->info.minor, child->props.new_name);
@ -1171,7 +1200,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
if (!_resume_node(child->name, child->info.major, child->info.minor, if (!_resume_node(child->name, child->info.major, child->info.minor,
child->props.read_ahead, child->props.read_ahead_flags, child->props.read_ahead, child->props.read_ahead_flags,
&newinfo, &child->dtree->cookie)) { &newinfo, &child->dtree->cookie, child->udev_flags)) {
log_error("Unable to resume %s (%" PRIu32 log_error("Unable to resume %s (%" PRIu32
":%" PRIu32 ")", child->name, child->info.major, ":%" PRIu32 ")", child->name, child->info.major,
child->info.minor); child->info.minor);
@ -1622,7 +1651,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
if (!_resume_node(child->name, child->info.major, child->info.minor, if (!_resume_node(child->name, child->info.major, child->info.minor,
child->props.read_ahead, child->props.read_ahead_flags, child->props.read_ahead, child->props.read_ahead_flags,
&newinfo, &child->dtree->cookie)) { &newinfo, &child->dtree->cookie, child->udev_flags)) {
log_error("Unable to resume %s (%" PRIu32 log_error("Unable to resume %s (%" PRIu32
":%" PRIu32 ")", child->name, child->info.major, ":%" PRIu32 ")", child->name, child->info.major,
child->info.minor); child->info.minor);