public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./WHATS_NEW_DM lib/commands/toolcontext.c ...
@ 2012-05-29 8:09 prajnoha
0 siblings, 0 replies; 2+ messages in thread
From: prajnoha @ 2012-05-29 8:09 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 2012-05-29 08:09:13
Modified files:
. : WHATS_NEW_DM
lib/commands : toolcontext.c
lib/misc : lvm-wrappers.c lvm-wrappers.h
libdm : libdevmapper.h
tools : dmsetup.c
Log message:
Remove unsupported udev_get_dev_path libudev call used for checking udev dir.
With latest changes in the udev, some deprecated functions were removed
from libudev amongst which there was the "udev_get_dev_path" function
we used to compare a device directory used in udev and directore set in
libdevmapper. The "/dev" is hardcoded in udev now (udev version >= 183).
Amongst other changes and from packager's point of view, it's also
important to note that the libudev development library ("libudev-devel")
could now be a part of the systemd development library ("systemd-devel")
because of the udev + systemd merge.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.602&r2=1.603
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/commands/toolcontext.c.diff?cvsroot=lvm2&r1=1.157&r2=1.158
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lvm-wrappers.c.diff?cvsroot=lvm2&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lvm-wrappers.h.diff?cvsroot=lvm2&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.187&r2=1.188
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.189&r2=1.190
--- LVM2/WHATS_NEW_DM 2012/05/15 21:27:24 1.602
+++ LVM2/WHATS_NEW_DM 2012/05/29 08:09:10 1.603
@@ -1,5 +1,6 @@
Version 1.02.75 -
================================
+ Remove unsupported udev_get_dev_path libudev call used for checking udev dir.
Set delay_resume_if_new on deptree snapshot origin.
Log value chosen in _find_config_bool like other variable types do.
Synchronize with dead of dmeventd.
--- LVM2/lib/commands/toolcontext.c 2012/05/23 13:02:37 1.157
+++ LVM2/lib/commands/toolcontext.c 2012/05/29 08:09:10 1.158
@@ -650,9 +650,9 @@
{
const struct dm_config_node *cn;
const struct dm_config_value *cv;
- size_t uninitialized_var(udev_dir_len), len;
+ size_t len, udev_dir_len = strlen(DM_UDEV_DEV_DIR);
+ int len_diff;
int device_list_from_udev;
- const char *uninitialized_var(udev_dir);
init_dev_disable_after_error_count(
find_config_tree_int(cmd, "devices/disable_after_error_count",
@@ -661,13 +661,9 @@
if (!dev_cache_init(cmd))
return_0;
- if ((device_list_from_udev = udev_is_running() ?
+ device_list_from_udev = udev_is_running() ?
find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev",
- DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0)) {
- if (!(udev_dir = udev_get_dev_dir()))
- stack;
- udev_dir_len = (udev_dir) ? strlen(udev_dir) : 0;
- }
+ DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0;
init_obtain_device_list_from_udev(device_list_from_udev);
if (!(cn = find_config_tree_node(cmd, "devices/scan"))) {
@@ -688,11 +684,19 @@
return 0;
}
- if (device_list_from_udev && udev_dir) {
+ if (device_list_from_udev) {
len = strlen(cv->v.str);
- len = udev_dir_len > len ? len : udev_dir_len;
- if (strncmp(udev_dir, cv->v.str, len) ||
- udev_dir[len] != cv->v.str[len]) {
+
+ /*
+ * DM_UDEV_DEV_DIR always has '/' at its end.
+ * If the item in the conf does not have it, be sure
+ * to make the right comparison without the '/' char!
+ */
+ len_diff = len && cv->v.str[len - 1] != '/' ?
+ udev_dir_len - 1 != len :
+ udev_dir_len != len;
+
+ if (len_diff || strncmp(DM_UDEV_DEV_DIR, cv->v.str, len)) {
device_list_from_udev = 0;
init_obtain_device_list_from_udev(0);
}
--- LVM2/lib/misc/lvm-wrappers.c 2011/04/22 12:00:00 1.4
+++ LVM2/lib/misc/lvm-wrappers.c 2012/05/29 08:09:11 1.5
@@ -65,16 +65,6 @@
return 0;
}
-const char *udev_get_dev_dir(void)
-{
- if (!_udev) {
- log_debug(_no_context_msg);
- return NULL;
- }
-
- return udev_get_dev_path(_udev);
-}
-
struct udev* udev_get_library_context(void)
{
return _udev;
@@ -96,10 +86,6 @@
return 0;
}
-const char *udev_get_dev_dir(void)
-{
- return NULL;
-}
#endif
int lvm_getpagesize(void)
--- LVM2/lib/misc/lvm-wrappers.h 2011/04/22 12:00:00 1.5
+++ LVM2/lib/misc/lvm-wrappers.h 2012/05/29 08:09:11 1.6
@@ -24,7 +24,6 @@
int udev_init_library_context(void);
void udev_fin_library_context(void);
int udev_is_running(void);
-const char *udev_get_dev_dir(void);
int lvm_getpagesize(void);
--- LVM2/libdm/libdevmapper.h 2012/03/02 17:31:22 1.187
+++ LVM2/libdm/libdevmapper.h 2012/05/29 08:09:11 1.188
@@ -1500,6 +1500,9 @@
struct dm_pool *dm_config_memory(struct dm_config_tree *cft);
+/* Udev device directory. */
+#define DM_UDEV_DEV_DIR "/dev/"
+
/* Cookie prefixes.
*
* The cookie value consists of a prefix (16 bits) and a base (16 bits).
--- LVM2/tools/dmsetup.c 2012/04/24 08:24:36 1.189
+++ LVM2/tools/dmsetup.c 2012/05/29 08:09:12 1.190
@@ -1008,11 +1008,9 @@
#else /* UDEV_SYNC_SUPPORT */
static int _set_up_udev_support(const char *dev_dir)
{
- struct udev *udev;
- const char *udev_dev_dir;
- size_t udev_dev_dir_len;
int dirs_diff;
const char *env;
+ size_t len = strlen(dev_dir), udev_dir_len = strlen(DM_UDEV_DEV_DIR);
if (_switches[NOUDEVSYNC_ARG])
dm_udev_set_sync_support(0);
@@ -1030,14 +1028,6 @@
" defined by --udevcookie option.",
_udev_cookie);
- if (!(udev = udev_new()) ||
- !(udev_dev_dir = udev_get_dev_path(udev)) ||
- !*udev_dev_dir) {
- log_error("Could not get udev dev path.");
- return 0;
- }
- udev_dev_dir_len = strlen(udev_dev_dir);
-
/*
* Normally, there's always a fallback action by libdevmapper if udev
* has not done its job correctly, e.g. the nodes were not created.
@@ -1049,12 +1039,17 @@
* is the same as "dev path" used by libdevmapper.
*/
- /* There's always a slash at the end of dev_dir. But check udev_dev_dir! */
- if (udev_dev_dir[udev_dev_dir_len - 1] != '/')
- dirs_diff = strncmp(dev_dir, udev_dev_dir, udev_dev_dir_len);
- else
- dirs_diff = strcmp(dev_dir, udev_dev_dir);
+ /*
+ * DM_UDEV_DEV_DIR always has '/' at its end.
+ * If the dev_dir does not have it, be sure
+ * to make the right comparison without the '/' char!
+ */
+ if (dev_dir[len - 1] != '/')
+ udev_dir_len--;
+
+ dirs_diff = udev_dir_len != len ||
+ strncmp(DM_UDEV_DEV_DIR, dev_dir, len);
_udev_only = !dirs_diff && (_udev_cookie || !_switches[VERIFYUDEV_ARG]);
if (dirs_diff) {
@@ -1064,11 +1059,10 @@
"about udev not working correctly while processing "
"particular nodes will be suppressed. These nodes "
"and symlinks will be managed in each directory "
- "separately.", dev_dir, udev_dev_dir);
+ "separately.", dev_dir, DM_UDEV_DEV_DIR);
dm_udev_set_checking(0);
}
- udev_unref(udev);
return 1;
}
^ permalink raw reply [flat|nested] 2+ messages in thread* LVM2 ./WHATS_NEW_DM lib/commands/toolcontext.c ...
@ 2012-01-10 2:03 agk
0 siblings, 0 replies; 2+ messages in thread
From: agk @ 2012-01-10 2:03 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2012-01-10 02:03:32
Modified files:
. : WHATS_NEW_DM
lib/commands : toolcontext.c
lib/locking : locking.c
libdm : libdevmapper.h libdm-common.c libdm-deptree.c
Log message:
Add dm_uuid_prefix/dm_set_uuid_prefix for non-lvm users to override hard-coded
LVM- prefix.
Try harder not to leave stray empty devices around (locally or remotely) when
reverting changes after failures while there are inactive tables.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.528&r2=1.529
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/commands/toolcontext.c.diff?cvsroot=lvm2&r1=1.144&r2=1.145
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/locking.c.diff?cvsroot=lvm2&r1=1.100&r2=1.101
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.173&r2=1.174
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.130&r2=1.131
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.147&r2=1.148
--- LVM2/WHATS_NEW_DM 2012/01/09 12:28:47 1.528
+++ LVM2/WHATS_NEW_DM 2012/01/10 02:03:31 1.529
@@ -1,11 +1,13 @@
Version 1.02.68 -
==================================
+ Remove empty devices when clearing left-over inactive tables in deptree.
+ Add dm_uuid_prefix/dm_set_uuid_prefix to override hard-coded LVM- prefix.
Improve dmsetup man page about readahead parameter.
Use sysfs to set/get of read-ahead setting if possible.
Fix lvm2-monitor init script to use normalized output when using vgs.
Add test for max length (DM_MAX_TYPE_NAME) of target type name.
Include a copy of kernel DM documentation in doc/kernel.
- Improve man page style for dmsetup.
+ Improve man page style for dmsetup and mention more targets.
Fix _get_proc_number to be tolerant of malformed /proc/misc entries.
Add ExecReload to dm-event.service for systemd to reload dmeventd properly.
Add dm_config_tree_find_str_allow_empty and dm_config_find_str_allow_empty.
--- LVM2/lib/commands/toolcontext.c 2011/12/18 21:56:03 1.144
+++ LVM2/lib/commands/toolcontext.c 2012/01/10 02:03:31 1.145
@@ -246,6 +246,9 @@
}
#ifdef DEVMAPPER_SUPPORT
dm_set_dev_dir(cmd->dev_dir);
+
+ if (!dm_set_uuid_prefix("LVM-"))
+ return_0;
#endif
/* proc dir */
--- LVM2/lib/locking/locking.c 2011/09/27 22:43:41 1.100
+++ LVM2/lib/locking/locking.c 2012/01/10 02:03:32 1.101
@@ -515,7 +515,6 @@
int suspend_lvs(struct cmd_context *cmd, struct dm_list *lvs,
struct volume_group *vg_to_revert)
{
- struct dm_list *lvh;
struct lv_list *lvl;
dm_list_iterate_items(lvl, lvs) {
@@ -523,11 +522,15 @@
log_error("Failed to suspend %s", lvl->lv->name);
if (vg_to_revert)
vg_revert(vg_to_revert);
- dm_list_uniterate(lvh, lvs, &lvl->list) {
- lvl = dm_list_item(lvh, struct lv_list);
+ /*
+ * FIXME Should be
+ * dm_list_uniterate(lvh, lvs, &lvl->list) {
+ * lvl = dm_list_item(lvh, struct lv_list);
+ * but revert would need fixing to use identical tree deps first.
+ */
+ dm_list_iterate_items(lvl, lvs)
if (!revert_lv(cmd, lvl->lv))
stack;
- }
return 0;
}
--- LVM2/libdm/libdevmapper.h 2011/12/21 12:52:38 1.173
+++ LVM2/libdm/libdevmapper.h 2012/01/10 02:03:32 1.174
@@ -285,6 +285,16 @@
const char *dm_sysfs_dir(void);
/*
+ * Configure default UUID prefix string.
+ * Conventionally this is a short capitalised prefix indicating the subsystem
+ * that is managing the devices, e.g. "LVM-" or "MPATH-".
+ * To support stacks of devices from different subsystems, recursive functions
+ * stop recursing if they reach a device with a different prefix.
+ */
+int dm_set_uuid_prefix(const char *uuid_prefix);
+const char *dm_uuid_prefix(void);
+
+/*
* Determine whether a major number belongs to device-mapper or not.
*/
int dm_is_dm_major(uint32_t major);
--- LVM2/libdm/libdm-common.c 2012/01/09 12:26:15 1.130
+++ LVM2/libdm/libdm-common.c 2012/01/10 02:03:32 1.131
@@ -61,6 +61,9 @@
static char _sysfs_dir[PATH_MAX] = "/sys/";
static char _path0[PATH_MAX]; /* path buffer, safe 4kB on stack */
+#define DM_MAX_UUID_PREFIX_LEN 15
+static char _default_uuid_prefix[DM_MAX_UUID_PREFIX_LEN + 1] = "LVM-";
+
static int _verbose = 0;
static int _suspended_dev_counter = 0;
@@ -1139,6 +1142,29 @@
return _sysfs_dir;
}
+/*
+ * Replace existing uuid_prefix provided it isn't too long.
+ */
+int dm_set_uuid_prefix(const char *uuid_prefix)
+{
+ if (!uuid_prefix)
+ return_0;
+
+ if (strlen(uuid_prefix) > DM_MAX_UUID_PREFIX_LEN) {
+ log_error("New uuid prefix %s too long.", uuid_prefix);
+ return 0;
+ }
+
+ strcpy(_default_uuid_prefix, uuid_prefix);
+
+ return 1;
+}
+
+const char *dm_uuid_prefix(void)
+{
+ return _default_uuid_prefix;
+}
+
int dm_device_has_holders(uint32_t major, uint32_t minor)
{
char sysfs_path[PATH_MAX];
--- LVM2/libdm/libdm-deptree.c 2011/12/21 12:52:38 1.147
+++ LVM2/libdm/libdm-deptree.c 2012/01/10 02:03:32 1.148
@@ -24,9 +24,6 @@
#define MAX_TARGET_PARAMSIZE 500000
-/* FIXME Fix interface so this is used only by LVM */
-#define UUID_PREFIX "LVM-"
-
#define REPLICATOR_LOCAL_SITE 0
/* Supported segment types */
@@ -488,25 +485,32 @@
const char *uuid)
{
struct dm_tree_node *node;
+ const char *default_uuid_prefix;
+ size_t default_uuid_prefix_len;
if ((node = dm_hash_lookup(dtree->uuids, uuid)))
return node;
- if (strncmp(uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
+ default_uuid_prefix = dm_uuid_prefix();
+ default_uuid_prefix_len = strlen(default_uuid_prefix);
+
+ if (strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len))
return NULL;
- return dm_hash_lookup(dtree->uuids, uuid + sizeof(UUID_PREFIX) - 1);
+ return dm_hash_lookup(dtree->uuids, uuid + default_uuid_prefix_len);
}
static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint32_t minor,
- const char **name, const char **uuid,
+ const char **name, const char **uuid, unsigned inactive_table,
struct dm_info *info, struct dm_deps **deps)
{
memset(info, 0, sizeof(*info));
if (!dm_is_dm_major(major)) {
- *name = "";
- *uuid = "";
+ if (name)
+ *name = "";
+ if (uuid)
+ *uuid = "";
*deps = NULL;
info->major = major;
info->minor = minor;
@@ -534,6 +538,12 @@
goto failed;
}
+ if (inactive_table && !dm_task_query_inactive_table(*dmt)) {
+ log_error("_deps: failed to set inactive table for (%" PRIu32 ":%" PRIu32 ")",
+ major, minor);
+ goto failed;
+ }
+
if (!dm_task_run(*dmt)) {
log_error("_deps: task run failed for (%" PRIu32 ":%" PRIu32 ")",
major, minor);
@@ -547,8 +557,10 @@
}
if (!info->exists) {
- *name = "";
- *uuid = "";
+ if (name)
+ *name = "";
+ if (uuid)
+ *uuid = "";
*deps = NULL;
} else {
if (info->major != major) {
@@ -561,11 +573,11 @@
minor, info->minor);
goto failed;
}
- if (!(*name = dm_pool_strdup(mem, dm_task_get_name(*dmt)))) {
+ if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(*dmt)))) {
log_error("name pool_strdup failed");
goto failed;
}
- if (!(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(*dmt)))) {
+ if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(*dmt)))) {
log_error("uuid pool_strdup failed");
goto failed;
}
@@ -595,7 +607,7 @@
/* Already in tree? */
if (!(node = _find_dm_tree_node(dtree, major, minor))) {
- if (!_deps(&dmt, dtree->mem, major, minor, &name, &uuid, &info, &deps))
+ if (!_deps(&dmt, dtree->mem, major, minor, &name, &uuid, 0, &info, &deps))
return_NULL;
if (!(node = _create_dm_tree_node(dtree, name, uuid, &info,
@@ -637,12 +649,22 @@
return node;
}
-static int _node_clear_table(struct dm_tree_node *dnode)
+// FIXME Move fn group down.
+static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
+ struct dm_info *info, struct dm_pool *mem,
+ const char **name, const char **uuid);
+static int _deactivate_node(const char *name, uint32_t major, uint32_t minor,
+ uint32_t *cookie, uint16_t udev_flags, int retry);
+static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags)
{
- struct dm_task *dmt;
- struct dm_info *info;
- const char *name;
- int r;
+ struct dm_task *dmt = NULL, *deps_dmt = NULL;
+ struct dm_info *info, deps_info;
+ struct dm_deps *deps = NULL;
+ const char *name, *uuid;
+ const char *default_uuid_prefix;
+ size_t default_uuid_prefix_len;
+ uint32_t i;
+ int r = 0;
if (!(info = &dnode->info)) {
log_error("_node_clear_table failed: missing info");
@@ -658,21 +680,24 @@
if (!info->exists || !info->inactive_table)
return 1;
-// FIXME Get inactive deps. If any dev referenced has 1 opener and no live table, remove it after the clear.
+ /* Get devices used by inactive table that's about to be deleted. */
+ if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, NULL, NULL, 1, info, &deps)) {
+ log_error("Failed to obtain dependencies for %s before clearing table.", name);
+ return 0;
+ }
log_verbose("Clearing inactive table %s (%" PRIu32 ":%" PRIu32 ")",
name, info->major, info->minor);
if (!(dmt = dm_task_create(DM_DEVICE_CLEAR))) {
log_error("Table clear dm_task creation failed for %s", name);
- return 0;
+ goto_out;
}
if (!dm_task_set_major(dmt, info->major) ||
!dm_task_set_minor(dmt, info->minor)) {
log_error("Failed to set device number for %s table clear", name);
- dm_task_destroy(dmt);
- return 0;
+ goto_out;
}
r = dm_task_run(dmt);
@@ -682,18 +707,60 @@
r = 0;
}
- dm_task_destroy(dmt);
+ if (!r || !deps)
+ goto_out;
+
+ /*
+ * Remove (incomplete) devices that the inactive table referred to but
+ * which are not in the tree, no longer referenced and don't have a live
+ * table.
+ */
+ default_uuid_prefix = dm_uuid_prefix();
+ default_uuid_prefix_len = strlen(default_uuid_prefix);
+
+ for (i = 0; i < deps->count; i++) {
+ /* If already in tree, assume it's under control */
+ if (_find_dm_tree_node(dnode->dtree, MAJOR(deps->device[i]), MINOR(deps->device[i])))
+ continue;
+
+ if (!_info_by_dev(MAJOR(deps->device[i]), MINOR(deps->device[i]), 1,
+ &deps_info, dnode->dtree->mem, &name, &uuid))
+ continue;
+
+ /* Proceed if device is an 'orphan' - unreferenced and without a live table. */
+ if (!deps_info.exists || deps_info.live_table || deps_info.open_count)
+ continue;
+
+ if (strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len))
+ continue;
+
+ /* Remove device. */
+ if (!_deactivate_node(name, deps_info.major, deps_info.minor, &dnode->dtree->cookie, udev_flags, 0)) {
+ log_error("Failed to deactivate no-longer-used device %s (%"
+ PRIu32 ":%" PRIu32 ")", name, deps_info.major, deps_info.minor);
+ } else if (deps_info.suspended)
+ dec_suspended();
+ }
+
+out:
+ if (dmt)
+ dm_task_destroy(dmt);
+
+ if (deps_dmt)
+ dm_task_destroy(deps_dmt);
return r;
}
-struct dm_tree_node *dm_tree_add_new_dev(struct dm_tree *dtree,
- const char *name,
- const char *uuid,
- uint32_t major, uint32_t minor,
- int read_only,
- int clear_inactive,
- void *context)
+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 *dnode;
struct dm_info info;
@@ -734,7 +801,7 @@
/* Do we need to rename node? */
if (!(dnode->props.new_name = dm_pool_strdup(dtree->mem, name))) {
log_error("name pool_strdup failed");
- return 0;
+ return NULL;
}
}
@@ -742,32 +809,21 @@
dnode->props.read_ahead = DM_READ_AHEAD_AUTO;
dnode->props.read_ahead_flags = 0;
- if (clear_inactive && !_node_clear_table(dnode))
+ if (clear_inactive && !_node_clear_table(dnode, udev_flags))
return_NULL;
dnode->context = context;
- dnode->udev_flags = 0;
+ dnode->udev_flags = udev_flags;
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 *dm_tree_add_new_dev(struct dm_tree *dtree, const char *name,
+ const char *uuid, uint32_t major, uint32_t minor,
+ int read_only, int clear_inactive, void *context)
{
- 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;
+ return dm_tree_add_new_dev_with_udev_flags(dtree, name, uuid, major, minor,
+ read_only, clear_inactive, context, 0);
}
void dm_tree_node_set_udev_flags(struct dm_tree_node *dnode, uint16_t udev_flags)
@@ -852,6 +908,9 @@
*/
static int _uuid_prefix_matches(const char *uuid, const char *uuid_prefix, size_t uuid_prefix_len)
{
+ const char *default_uuid_prefix = dm_uuid_prefix();
+ size_t default_uuid_prefix_len = strlen(default_uuid_prefix);
+
if (!uuid_prefix)
return 1;
@@ -862,13 +921,13 @@
if (uuid_prefix_len <= 4)
return 0;
- if (!strncmp(uuid, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
+ if (!strncmp(uuid, default_uuid_prefix, default_uuid_prefix_len))
return 0;
- if (strncmp(uuid_prefix, UUID_PREFIX, sizeof(UUID_PREFIX) - 1))
+ if (strncmp(uuid_prefix, default_uuid_prefix, default_uuid_prefix_len))
return 0;
- if (!strncmp(uuid, uuid_prefix + sizeof(UUID_PREFIX) - 1, uuid_prefix_len - (sizeof(UUID_PREFIX) - 1)))
+ if (!strncmp(uuid, uuid_prefix + default_uuid_prefix_len, uuid_prefix_len - default_uuid_prefix_len))
return 1;
return 0;
@@ -976,7 +1035,8 @@
* Deactivate a device with its dependencies if the uuid prefix matches.
*/
static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
- struct dm_info *info)
+ struct dm_info *info, struct dm_pool *mem,
+ const char **name, const char **uuid)
{
struct dm_task *dmt;
int r;
@@ -995,9 +1055,25 @@
if (!with_open_count && !dm_task_no_open_count(dmt))
log_error("Failed to disable open_count");
- if ((r = dm_task_run(dmt)))
- r = dm_task_get_info(dmt, info);
+ if (!(r = dm_task_run(dmt)))
+ goto_out;
+
+ if (!(r = dm_task_get_info(dmt, info)))
+ goto_out;
+ if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) {
+ log_error("name pool_strdup failed");
+ r = 0;
+ goto_out;
+ }
+
+ if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) {
+ log_error("uuid pool_strdup failed");
+ r = 0;
+ goto_out;
+ }
+
+out:
dm_task_destroy(dmt);
return r;
@@ -1061,7 +1137,7 @@
}
/* Refresh open_count */
- if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info) ||
+ if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL) ||
!info.exists)
continue;
@@ -1096,9 +1172,9 @@
if (!dm_task_no_open_count(dmt))
log_error("Failed to disable open_count");
- if (!dm_task_set_cookie(dmt, cookie, udev_flags))
- goto out;
-
+ if (cookie)
+ if (!dm_task_set_cookie(dmt, cookie, udev_flags))
+ goto out;
if (retry)
dm_task_retry_remove(dmt);
@@ -1107,7 +1183,7 @@
/* FIXME Until kernel returns actual name so dm-iface.c can handle it */
rm_dev_node(name, dmt->cookie_set && !(udev_flags & DM_UDEV_DISABLE_DM_RULES_FLAG),
- dmt->cookie_set && (udev_flags & DM_UDEV_DISABLE_LIBRARY_FALLBACK));
+ dmt->cookie_set && (udev_flags & DM_UDEV_DISABLE_LIBRARY_FALLBACK));
/* FIXME Remove node from tree or mark invalid? */
@@ -1440,7 +1516,7 @@
continue;
/* Refresh open_count */
- if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info) ||
+ if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL) ||
!info.exists)
continue;
@@ -1564,7 +1640,7 @@
if (!_children_suspended(child, 1, uuid_prefix, uuid_prefix_len))
continue;
- if (!_info_by_dev(dinfo->major, dinfo->minor, 0, &info) ||
+ if (!_info_by_dev(dinfo->major, dinfo->minor, 0, &info, NULL, NULL, NULL) ||
!info.exists || info.suspended)
continue;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-29 8:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-29 8:09 LVM2 ./WHATS_NEW_DM lib/commands/toolcontext.c prajnoha
-- strict thread matches above, loose matches on Subject: below --
2012-01-10 2:03 agk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).