public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li ...
@ 2009-11-06 0:43 agk
0 siblings, 0 replies; 5+ messages in thread
From: agk @ 2009-11-06 0:43 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2009-11-06 00:43:10
Modified files:
. : WHATS_NEW_DM
libdm : .exported_symbols libdevmapper.h libdm-common.c
libdm/ioctl : libdm-iface.c libdm-targets.h
libdm/misc : dm-ioctl.h
man : dmsetup.8.in
tools : dmsetup.c
Log message:
Add support for querying a device's inactive table.
Currently this data is invisible to userspace.
Requires dm >= 4.16 (likely to be in linux 2.6.33).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.311&r2=1.312
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/.exported_symbols.diff?cvsroot=lvm2&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.100&r2=1.101
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.89&r2=1.90
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.64&r2=1.65
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-targets.h.diff?cvsroot=lvm2&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/misc/dm-ioctl.h.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/dmsetup.8.in.diff?cvsroot=lvm2&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.126&r2=1.127
--- LVM2/WHATS_NEW_DM 2009/11/03 15:50:42 1.311
+++ LVM2/WHATS_NEW_DM 2009/11/06 00:43:08 1.312
@@ -1,5 +1,7 @@
Version 1.02.40 -
===================================
+ Add dmsetup --inactive support.
+ Add dm_task_query_inactive_table to libdevmapper for kernel driver >= 4.16.
Fix hash lookup segfault when keys compared are different lengths.
Version 1.02.39 - 26th October 2009
--- LVM2/libdm/.exported_symbols 2009/10/22 13:00:07 1.44
+++ LVM2/libdm/.exported_symbols 2009/11/06 00:43:08 1.45
@@ -40,6 +40,7 @@
dm_task_no_flush
dm_task_no_open_count
dm_task_skip_lockfs
+dm_task_query_inactive_table
dm_task_update_nodes
dm_task_run
dm_get_next_target
--- LVM2/libdm/libdevmapper.h 2009/10/26 14:29:33 1.100
+++ LVM2/libdm/libdevmapper.h 2009/11/06 00:43:08 1.101
@@ -172,6 +172,7 @@
int dm_task_no_flush(struct dm_task *dmt);
int dm_task_no_open_count(struct dm_task *dmt);
int dm_task_skip_lockfs(struct dm_task *dmt);
+int dm_task_query_inactive_table(struct dm_task *dmt);
int dm_task_suppress_identical_reload(struct dm_task *dmt);
/*
--- LVM2/libdm/libdm-common.c 2009/10/26 21:38:35 1.89
+++ LVM2/libdm/libdm-common.c 2009/11/06 00:43:09 1.90
@@ -181,6 +181,7 @@
dmt->read_ahead_flags = 0;
dmt->event_nr = 0;
dmt->cookie_set = 0;
+ dmt->query_inactive_table = 0;
return dmt;
}
--- LVM2/libdm/ioctl/libdm-iface.c 2009/10/26 14:29:34 1.64
+++ LVM2/libdm/ioctl/libdm-iface.c 2009/11/06 00:43:09 1.65
@@ -1135,6 +1135,13 @@
return 1;
}
+int dm_task_query_inactive_table(struct dm_task *dmt)
+{
+ dmt->query_inactive_table = 1;
+
+ return 1;
+}
+
int dm_task_set_event_nr(struct dm_task *dmt, uint32_t event_nr)
{
dmt->event_nr = event_nr;
@@ -1382,6 +1389,12 @@
dmi->flags |= DM_READONLY_FLAG;
if (dmt->skip_lockfs)
dmi->flags |= DM_SKIP_LOCKFS_FLAG;
+ if (dmt->query_inactive_table) {
+ if (_dm_version_minor < 16)
+ log_warn("WARNING: Inactive table query unsupported "
+ "by kernel. It will use live table.");
+ dmi->flags |= DM_QUERY_INACTIVE_TABLE_FLAG;
+ }
dmi->target_count = count;
dmi->event_nr = dmt->event_nr;
@@ -1723,7 +1736,7 @@
}
log_debug("dm %s %s %s%s%s %s%.0d%s%.0d%s"
- "%s%c%c%s %.0" PRIu64 " %s [%u]",
+ "%s%c%c%s%s %.0" PRIu64 " %s [%u]",
_cmd_data_v4[dmt->type].name,
dmi->name, dmi->uuid, dmt->newname ? " " : "",
dmt->newname ? dmt->newname : "",
@@ -1736,6 +1749,7 @@
dmt->no_open_count ? 'N' : 'O',
dmt->no_flush ? 'N' : 'F',
dmt->skip_lockfs ? "S " : "",
+ dmt->query_inactive_table ? "I " : "",
dmt->sector, dmt->message ? dmt->message : "",
dmi->data_size);
#ifdef DM_IOCTLS
--- LVM2/libdm/ioctl/libdm-targets.h 2009/08/03 18:01:48 1.25
+++ LVM2/libdm/ioctl/libdm-targets.h 2009/11/06 00:43:09 1.26
@@ -58,6 +58,7 @@
int no_flush;
int no_open_count;
int skip_lockfs;
+ int query_inactive_table;
int suppress_identical_reload;
uint64_t existing_table_size;
int cookie_set;
--- LVM2/libdm/misc/dm-ioctl.h 2009/08/03 18:44:54 1.2
+++ LVM2/libdm/misc/dm-ioctl.h 2009/11/06 00:43:09 1.3
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
- * Copyright (C) 2004 - 2005 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
*
* This file is released under the LGPL.
*/
@@ -268,9 +268,9 @@
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
#define DM_VERSION_MAJOR 4
-#define DM_VERSION_MINOR 15
+#define DM_VERSION_MINOR 16
#define DM_VERSION_PATCHLEVEL 0
-#define DM_VERSION_EXTRA "-ioctl (2009-04-01)"
+#define DM_VERSION_EXTRA "-ioctl (2009-11-05)"
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
@@ -311,4 +311,11 @@
*/
#define DM_NOFLUSH_FLAG (1 << 11) /* In */
+/*
+ * If set, any table information returned will relate to the inactive
+ * table instead of the live one. Always check DM_INACTIVE_PRESENT_FLAG
+ * is set before using the data returned.
+ */
+#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */
+
#endif /* _LINUX_DM_IOCTL_H */
--- LVM2/man/dmsetup.8.in 2009/10/22 13:12:20 1.27
+++ LVM2/man/dmsetup.8.in 2009/11/06 00:43:09 1.28
@@ -107,6 +107,11 @@
.IP \fB-c|-C|--columns
.br
Display output in columns rather than as Field: Value lines.
+.IP \fB--inactive
+.br
+When returning any table information from the kernel report on the
+inactive table instead of the live table.
+Requires kernel driver version 4.16.0 or above.
.IP \fB-j|--major\ \fImajor
.br
Specify the major number.
@@ -277,7 +282,7 @@
Splits given device name into subsystem constituents.
Default subsystem is LVM.
.IP \fBstatus
-.I [--target target_type]
+.I [--target target_type] [--inactive]
.I [device_name]
.br
Outputs status information for each of the device's targets.
@@ -296,7 +301,7 @@
the --noflush option. This lets outstanding I/O that has not yet reached the
device to remain unflushed.
.IP \fBtable
-.I [--target target_type]
+.I [--target target_type] [--inactive]
.I [device_name]
.br
Outputs the current table for the device in a format that can be fed
--- LVM2/tools/dmsetup.c 2009/10/26 14:29:34 1.126
+++ LVM2/tools/dmsetup.c 2009/11/06 00:43:10 1.127
@@ -117,6 +117,7 @@
EXEC_ARG,
FORCE_ARG,
GID_ARG,
+ INACTIVE_ARG,
MAJOR_ARG,
MINOR_ARG,
MODE_ARG,
@@ -296,6 +297,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto err;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto err;
+
if (!dm_task_run(dmt))
goto err;
@@ -530,6 +534,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -587,6 +594,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (_switches[READAHEAD_ARG] &&
!dm_task_set_read_ahead(dmt, _int_args[READAHEAD_ARG],
_read_ahead_flags))
@@ -630,6 +640,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_set_cookie(dmt, &cookie, 0) ||
!dm_task_run(dmt))
goto out;
@@ -696,6 +709,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -728,6 +744,12 @@
if (!dm_task_set_geometry(dmt, argv[1], argv[2], argv[3], argv[4]))
goto out;
+ if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
+ goto out;
+
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
/* run the task */
if (!dm_task_run(dmt))
goto out;
@@ -1002,6 +1024,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (_switches[NOLOCKFS_ARG] && !dm_task_skip_lockfs(dmt))
goto out;
@@ -1115,6 +1140,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -1162,6 +1190,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto error;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto error;
+
if (!dm_task_run(dmt))
goto error;
@@ -1337,6 +1368,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -1458,6 +1492,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -1496,6 +1533,9 @@
if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt))
goto out;
+ if (_switches[INACTIVE_ARG] && !dm_task_query_inactive_table(dmt))
+ goto out;
+
if (!dm_task_run(dmt))
goto out;
@@ -2510,7 +2550,7 @@
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
- " [-r|--readonly] [--noopencount] [--nolockfs]\n"
+ " [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n"
" [--noudevsync] [-y|--yes] [--readahead [+]<sectors>|auto|none]\n"
" [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
" [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
@@ -2866,6 +2906,7 @@
{"exec", 1, &ind, EXEC_ARG},
{"force", 0, &ind, FORCE_ARG},
{"gid", 1, &ind, GID_ARG},
+ {"inactive", 0, &ind, INACTIVE_ARG},
{"major", 1, &ind, MAJOR_ARG},
{"minor", 1, &ind, MINOR_ARG},
{"mode", 1, &ind, MODE_ARG},
@@ -3010,6 +3051,8 @@
_switches[TARGET_ARG]++;
_target = optarg;
}
+ if ((ind == INACTIVE_ARG))
+ _switches[INACTIVE_ARG]++;
if ((ind == NAMEPREFIXES_ARG))
_switches[NAMEPREFIXES_ARG]++;
if ((ind == NOFLUSH_ARG))
^ permalink raw reply [flat|nested] 5+ messages in thread
* LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li ...
@ 2010-04-20 13:58 agk
0 siblings, 0 replies; 5+ messages in thread
From: agk @ 2010-04-20 13:58 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2010-04-20 13:58:23
Modified files:
. : WHATS_NEW_DM
libdm : .exported_symbols libdevmapper.h
libdm/datastruct: bitset.c
Log message:
Add dm_bitset_equal to libdevmapper.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.359&r2=1.360
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/.exported_symbols.diff?cvsroot=lvm2&r1=1.50&r2=1.51
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.110&r2=1.111
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/datastruct/bitset.c.diff?cvsroot=lvm2&r1=1.9&r2=1.10
--- LVM2/WHATS_NEW_DM 2010/04/19 21:23:01 1.359
+++ LVM2/WHATS_NEW_DM 2010/04/20 13:58:22 1.360
@@ -1,6 +1,6 @@
Version 1.02.47 -
=================================
- Add dm_bit_and.
+ Add dm_bit_and and dm_bitset_equal to libdevmapper.
Simplify dm_bitset_create.
Speed up dm_bit_get_next with ffs().
--- LVM2/libdm/.exported_symbols 2010/04/20 10:58:18 1.50
+++ LVM2/libdm/.exported_symbols 2010/04/20 13:58:22 1.51
@@ -109,6 +109,7 @@
dm_pool_zalloc
dm_bitset_create
dm_bitset_destroy
+dm_bitset_equal
dm_bit_and
dm_bit_union
dm_bit_get_first
--- LVM2/libdm/libdevmapper.h 2010/04/20 10:58:18 1.110
+++ LVM2/libdm/libdevmapper.h 2010/04/20 13:58:22 1.111
@@ -600,6 +600,8 @@
dm_bitset_t dm_bitset_create(struct dm_pool *mem, unsigned num_bits);
void dm_bitset_destroy(dm_bitset_t bs);
+int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2);
+
void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2);
void dm_bit_union(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2);
int dm_bit_get_first(dm_bitset_t bs);
--- LVM2/libdm/datastruct/bitset.c 2010/04/19 21:23:02 1.9
+++ LVM2/libdm/datastruct/bitset.c 2010/04/20 13:58:23 1.10
@@ -42,6 +42,17 @@
dm_free(bs);
}
+int dm_bitset_equal(dm_bitset_t in1, dm_bitset_t in2)
+{
+ int i;
+
+ for (i = (in1[0] / DM_BITS_PER_INT) + 1; i; i--)
+ if (in1[i] != in2[i])
+ return 0;
+
+ return 1;
+}
+
void dm_bit_and(dm_bitset_t out, dm_bitset_t in1, dm_bitset_t in2)
{
int i;
^ permalink raw reply [flat|nested] 5+ messages in thread
* LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li ...
@ 2010-02-15 16:21 prajnoha
0 siblings, 0 replies; 5+ messages in thread
From: prajnoha @ 2010-02-15 16:21 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 2010-02-15 16:21:34
Modified files:
. : WHATS_NEW_DM
libdm : .exported_symbols libdevmapper.h libdm-common.c
libdm/ioctl : libdm-iface.c
tools : dmsetup.c
Log message:
Several changes in dmsetup and libdevmapper:
- add DM_UDEV_DISABLE_LIBRARY_FALLBACK udev flag to rely on udev only
- export dm_udev_create_cookie function to create new cookies on demand
- add --udevcookie, udevcreatecookie and udevreleasecookie for dmsetup
(to support "udev transactions" where one cookie value can be used for
several dmsetup calls)
- don't use DM_UDEV_DISABLE_CHECKING env. var. anymore and set the state
automatically (based on udev and libdevmapper dev path comparison)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.343&r2=1.344
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/.exported_symbols.diff?cvsroot=lvm2&r1=1.48&r2=1.49
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.108&r2=1.109
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.92&r2=1.93
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.66&r2=1.67
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.133&r2=1.134
--- LVM2/WHATS_NEW_DM 2010/02/02 14:09:17 1.343
+++ LVM2/WHATS_NEW_DM 2010/02/15 16:21:33 1.344
@@ -1,5 +1,9 @@
Version 1.02.44 -
===================================
+ Add DM_UDEV_DISABLE_LIBRARY_FALLBACK udev flag to rely on udev only.
+ Export dm_udev_create_cookie function to create new cookies on demand.
+ Add --udevcookie, udevcreatecookie and udevreleasecookie for dmsetup.
+ Don't use DM_UDEV_DISABLE_CHECKING env. var. anymore and set the state automatically.
Version 1.02.43 - 21st January 2010
===================================
--- LVM2/libdm/.exported_symbols 2010/01/13 01:39:45 1.48
+++ LVM2/libdm/.exported_symbols 2010/02/15 16:21:33 1.49
@@ -166,5 +166,6 @@
dm_udev_get_sync_support
dm_udev_set_checking
dm_udev_get_checking
+dm_udev_create_cookie
dm_udev_complete
dm_udev_wait
--- LVM2/libdm/libdevmapper.h 2010/01/14 10:15:23 1.108
+++ LVM2/libdm/libdevmapper.h 2010/02/15 16:21:33 1.109
@@ -1084,6 +1084,13 @@
* snapshot devices.
*/
#define DM_UDEV_LOW_PRIORITY_FLAG 0x0010
+/*
+ * DM_UDEV_DISABLE_LIBRARY_FALLBACK is set in case we need to disable
+ * libdevmapper's node management. We will rely on udev completely
+ * and there will be no fallback action provided by libdevmapper if
+ * udev does something improperly.
+ */
+#define DM_UDEV_DISABLE_LIBRARY_FALLBACK 0x0020
int dm_cookie_supported(void);
@@ -1094,6 +1101,7 @@
int dm_udev_get_sync_support(void);
void dm_udev_set_checking(int checking);
int dm_udev_get_checking(void);
+int dm_udev_create_cookie(uint32_t *cookie);
int dm_udev_complete(uint32_t cookie);
int dm_udev_wait(uint32_t cookie);
--- LVM2/libdm/libdm-common.c 2010/01/11 15:36:24 1.92
+++ LVM2/libdm/libdm-common.c 2010/02/15 16:21:33 1.93
@@ -1166,6 +1166,16 @@
return 0;
}
+int dm_udev_create_cookie(uint32_t *cookie)
+{
+ int semid;
+
+ if (!dm_udev_get_sync_support())
+ return 1;
+
+ return _udev_notify_sem_create(cookie, &semid);
+}
+
int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags)
{
int semid;
--- LVM2/libdm/ioctl/libdm-iface.c 2009/11/13 12:43:22 1.66
+++ LVM2/libdm/ioctl/libdm-iface.c 2010/02/15 16:21:34 1.67
@@ -1789,6 +1789,7 @@
struct dm_ioctl *dmi;
unsigned command;
int check_udev;
+ int udev_only;
#ifdef DM_COMPAT
if (_dm_version == 1)
@@ -1847,22 +1848,25 @@
!(dmt->event_nr >> DM_UDEV_FLAGS_SHIFT &
DM_UDEV_DISABLE_DM_RULES_FLAG);
+ udev_only = dmt->cookie_set ? (dmt->event_nr >> DM_UDEV_FLAGS_SHIFT &
+ DM_UDEV_DISABLE_LIBRARY_FALLBACK) : 0;
+
switch (dmt->type) {
case DM_DEVICE_CREATE:
- if (dmt->dev_name && *dmt->dev_name)
+ if (dmt->dev_name && *dmt->dev_name && !udev_only)
add_dev_node(dmt->dev_name, MAJOR(dmi->dev),
MINOR(dmi->dev), dmt->uid, dmt->gid,
dmt->mode, check_udev);
break;
case DM_DEVICE_REMOVE:
/* FIXME Kernel needs to fill in dmi->name */
- if (dmt->dev_name)
+ if (dmt->dev_name && !udev_only)
rm_dev_node(dmt->dev_name, check_udev);
break;
case DM_DEVICE_RENAME:
/* FIXME Kernel needs to fill in dmi->name */
- if (dmt->dev_name)
+ if (dmt->dev_name && !udev_only)
rename_dev_node(dmt->dev_name, dmt->newname,
check_udev);
break;
--- LVM2/tools/dmsetup.c 2010/01/14 10:15:23 1.133
+++ LVM2/tools/dmsetup.c 2010/02/15 16:21:34 1.134
@@ -45,6 +45,10 @@
# include <sys/types.h>
# include <sys/ipc.h>
# include <sys/sem.h>
+#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
+# define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
+# include <libudev.h>
+#endif
#endif
/* FIXME Unused so far */
@@ -96,7 +100,10 @@
#define ARGS_MAX 256
#define LOOP_TABLE_SIZE (PATH_MAX + 255)
-#define DEFAULT_DM_DEV_DIR "/dev"
+#define DEFAULT_DM_DEV_DIR "/dev/"
+
+#define DM_DEV_DIR_ENV_VAR_NAME "DM_DEV_DIR"
+#define DM_UDEV_COOKIE_ENV_VAR_NAME "DM_UDEV_COOKIE"
/* FIXME Should be imported */
#ifndef DM_MAX_TYPE_NAME
@@ -127,6 +134,7 @@
NOLOCKFS_ARG,
NOOPENCOUNT_ARG,
NOTABLE_ARG,
+ UDEVCOOKIE_ARG,
NOUDEVRULES_ARG,
NOUDEVSYNC_ARG,
OPTIONS_ARG,
@@ -165,6 +173,8 @@
static char *_target;
static char *_command;
static uint32_t _read_ahead_flags;
+static uint32_t _udev_cookie;
+static int _udev_only;
static struct dm_tree *_dtree;
static struct dm_report *_report;
static report_type_t _report_type;
@@ -611,6 +621,12 @@
udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG |
DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG;
+ if (_udev_cookie) {
+ cookie = _udev_cookie;
+ if (_udev_only)
+ udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK;
+ }
+
if (!dm_task_set_cookie(dmt, &cookie, udev_flags) ||
!dm_task_run(dmt))
goto out;
@@ -621,7 +637,8 @@
r = _display_info(dmt);
out:
- (void) dm_udev_wait(cookie);
+ if (!_udev_cookie)
+ (void) dm_udev_wait(cookie);
dm_task_destroy(dmt);
return r;
@@ -654,6 +671,12 @@
udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG |
DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG;
+ if (_udev_cookie) {
+ cookie = _udev_cookie;
+ if (_udev_only)
+ udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK;
+ }
+
if (!dm_task_set_cookie(dmt, &cookie, udev_flags) ||
!dm_task_run(dmt))
goto out;
@@ -661,7 +684,8 @@
r = 1;
out:
- (void) dm_udev_wait(cookie);
+ if (!_udev_cookie)
+ (void) dm_udev_wait(cookie);
dm_task_destroy(dmt);
return r;
@@ -791,7 +815,7 @@
return r;
}
-static uint32_t _get_cookie_value(char *str_value)
+static uint32_t _get_cookie_value(const char *str_value)
{
unsigned long int value;
char *p;
@@ -817,7 +841,8 @@
"DISABLE_DISK_RULES",
"DISABLE_OTHER_RULES",
"LOW_PRIORITY",
- 0, 0, 0};
+ "DISABLE_LIBRARY_FALLBACK",
+ 0, 0};
if (!(cookie = _get_cookie_value(argv[1])))
return 0;
@@ -872,6 +897,22 @@
#ifndef UDEV_SYNC_SUPPORT
static const char _cmd_not_supported[] = "Command not supported. Recompile with \"--enable-udev-sync\" to enable.";
+static int _udevcreatecookie(int argc, char **argv,
+ void *data __attribute((unused)))
+{
+ log_error(_cmd_not_supported);
+
+ return 0;
+}
+
+static int _udevreleasecookie(int argc, char **argv,
+ void *data __attribute((unused)))
+{
+ log_error(_cmd_not_supported);
+
+ return 0;
+}
+
static int _udevcomplete_all(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
log_error(_cmd_not_supported);
@@ -887,6 +928,102 @@
}
#else /* UDEV_SYNC_SUPPORT */
+static int _set_up_udev_support(const char *dev_dir)
+{
+#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
+ struct udev *udev;
+ const char *udev_dev_dir;
+ size_t udev_dev_dir_len;
+ int dirs_diff;
+#endif
+ const char *env;
+
+ if (_switches[NOUDEVSYNC_ARG])
+ dm_udev_set_sync_support(0);
+
+ if (!_udev_cookie) {
+ env = getenv(DM_UDEV_COOKIE_ENV_VAR_NAME);
+ if (env && *env && (_udev_cookie = _get_cookie_value(env)))
+ log_debug("Using udev transaction 0x%08" PRIX32
+ " defined by %s environment variable.",
+ _udev_cookie,
+ DM_UDEV_COOKIE_ENV_VAR_NAME);
+ }
+ else if (_switches[UDEVCOOKIE_ARG])
+ log_debug("Using udev transaction 0x%08" PRIX32
+ " defined by --udevcookie option.",
+ _udev_cookie);
+
+#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
+ 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.
+ * If using udev transactions by specifying existing cookie value,
+ * we need to disable node creation by libdevmapper completely,
+ * disabling any fallback actions, since any synchronisation happens
+ * at the end of the transaction only. We need to do this to prevent
+ * races between udev and libdevmapper but only in case udev "dev path"
+ * 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);
+
+ _udev_only = _udev_cookie && !dirs_diff;
+
+ if (dirs_diff) {
+ log_debug("The path %s used for creating device nodes that is "
+ "set via DM_DEV_DIR environment variable differs from "
+ "the path %s that is used by udev. All warnings "
+ "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);
+ dm_udev_set_checking(0);
+ }
+
+ udev_unref(udev);
+#endif
+ return 1;
+}
+
+static int _udevcreatecookie(int argc, char **argv,
+ void *data __attribute((unused)))
+{
+ uint32_t cookie;
+
+ if (!dm_udev_create_cookie(&cookie))
+ return 0;
+
+ printf("0x%08" PRIX32 "\n", cookie);
+
+ return 1;
+}
+
+static int _udevreleasecookie(int argc, char **argv,
+ void *data __attribute((unused)))
+{
+ if (argv[1] && !(_udev_cookie = _get_cookie_value(argv[1])))
+ return 0;
+
+ if (!_udev_cookie) {
+ log_error("No udev transaction cookie given.");
+ return 0;
+ }
+
+ return dm_udev_wait(_udev_cookie);
+}
static char _yes_no_prompt(const char *prompt, ...)
{
@@ -1059,6 +1196,12 @@
udev_flags |= DM_UDEV_DISABLE_DM_RULES_FLAG |
DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG;
+ if (_udev_cookie) {
+ cookie = _udev_cookie;
+ if (_udev_only)
+ udev_flags |= DM_UDEV_DISABLE_LIBRARY_FALLBACK;
+ }
+
if (udev_wait_flag && !dm_task_set_cookie(dmt, &cookie, udev_flags))
goto out;
@@ -1068,7 +1211,7 @@
r = _display_info(dmt);
out:
- if (udev_wait_flag)
+ if (!_udev_cookie && udev_wait_flag)
(void) dm_udev_wait(cookie);
dm_task_destroy(dmt);
@@ -2559,6 +2702,8 @@
{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, 1, _status},
{"wait", "<device> [<event_nr>]", 0, 2, _wait},
{"mknodes", "[<device>]", 0, 1, _mknodes},
+ {"udevcreatecookie", "", 0, 0, _udevcreatecookie},
+ {"udevreleasecookie", "[<cookie>]", 0, 1, _udevreleasecookie},
{"udevflags", "<cookie>", 1, 1, _udevflags},
{"udevcomplete", "<cookie>", 1, 1, _udevcomplete},
{"udevcomplete_all", "", 0, 0, _udevcomplete_all},
@@ -2577,7 +2722,7 @@
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
" [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n"
- " [--noudevrules] [--noudevsync] [-y|--yes]\n"
+ " [--udevcookie] [--noudevrules] [--noudevsync] [-y|--yes]\n"
" [--readahead [+]<sectors>|auto|none]\n"
" [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
" [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
@@ -2812,6 +2957,8 @@
return 0;
}
+
+
static int _process_losetup_switches(const char *base, int *argc, char ***argv,
const char *dev_dir)
{
@@ -2946,6 +3093,7 @@
{"nolockfs", 0, &ind, NOLOCKFS_ARG},
{"noopencount", 0, &ind, NOOPENCOUNT_ARG},
{"notable", 0, &ind, NOTABLE_ARG},
+ {"udevcookie", 1, &ind, UDEVCOOKIE_ARG},
{"noudevrules", 0, &ind, NOUDEVRULES_ARG},
{"noudevsync", 0, &ind, NOUDEVSYNC_ARG},
{"options", 1, &ind, OPTIONS_ARG},
@@ -3059,6 +3207,10 @@
}
if (c == 'y' || ind == YES_ARG)
_switches[YES_ARG]++;
+ if (ind == UDEVCOOKIE_ARG) {
+ _switches[UDEVCOOKIE_ARG]++;
+ _udev_cookie = _get_cookie_value(optarg);
+ }
if (ind == NOUDEVRULES_ARG)
_switches[NOUDEVRULES_ARG]++;
if (ind == NOUDEVSYNC_ARG)
@@ -3160,11 +3312,10 @@
struct command *c;
int r = 1;
const char *dev_dir;
- const char *disable_udev_checking;
(void) setlocale(LC_ALL, "");
- dev_dir = getenv ("DM_DEV_DIR");
+ dev_dir = getenv (DM_DEV_DIR_ENV_VAR_NAME);
if (dev_dir && *dev_dir) {
if (!dm_set_dev_dir(dev_dir)) {
fprintf(stderr, "Invalid DM_DEV_DIR environment variable value.\n");
@@ -3207,13 +3358,10 @@
if (_switches[COLS_ARG] && !_report_init(c))
goto out;
- if (_switches[NOUDEVSYNC_ARG])
- dm_udev_set_sync_support(0);
-
- disable_udev_checking = getenv("DM_UDEV_DISABLE_CHECKING");
- if ((disable_udev_checking && *disable_udev_checking) &&
- !strcmp(disable_udev_checking, "1"))
- dm_udev_set_checking(0);
+ #ifdef UDEV_SYNC_SUPPORT
+ if (!_set_up_udev_support(dev_dir))
+ goto out;
+ #endif
doit:
if (!c->fn(argc, argv, NULL)) {
^ permalink raw reply [flat|nested] 5+ messages in thread
* LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li ...
@ 2010-01-11 15:36 prajnoha
0 siblings, 0 replies; 5+ messages in thread
From: prajnoha @ 2010-01-11 15:36 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 2010-01-11 15:36:25
Modified files:
. : WHATS_NEW_DM
libdm : .exported_symbols libdevmapper.h libdm-common.c
tools : dmsetup.c
Log message:
Add support to disable udev checking: DM_UDEV_DISABLE_CHECKING=1 env. variable.
Sometimes it is really needed to switch off udev checking and the warnings we show when
we detect that udev has not done its job right - the messages like "Udev should have done
this and that. Falling back to direct node creation/removal. " etc.
This would be especially handy while setting DM_DEV_DIR env var that could be set to a
different location than standard /dev (udev can't create nodes/symlinks out of that one
directory that is configured into udevd). The exact same situation happens while we're
running our tests.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.326&r2=1.327
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/.exported_symbols.diff?cvsroot=lvm2&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.104&r2=1.105
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.91&r2=1.92
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.131&r2=1.132
--- LVM2/WHATS_NEW_DM 2010/01/07 19:54:21 1.326
+++ LVM2/WHATS_NEW_DM 2010/01/11 15:36:24 1.327
@@ -1,5 +1,6 @@
Version 1.02.41 -
====================================
+ Add support to disable udev checking: DM_UDEV_DISABLE_CHECKING=1 env. variable.
Add dm_tree_add_dev_with_udev_flags to provide wider support for udev flags.
Add --noudevrules option for dmsetup to disable /dev node management by udev.
Update code to show all fields for 'dmsetup info -c -o all'.
--- LVM2/libdm/.exported_symbols 2010/01/07 19:54:22 1.46
+++ LVM2/libdm/.exported_symbols 2010/01/11 15:36:24 1.47
@@ -163,5 +163,7 @@
dm_cookie_supported
dm_udev_set_sync_support
dm_udev_get_sync_support
+dm_udev_set_checking
+dm_udev_get_checking
dm_udev_complete
dm_udev_wait
--- LVM2/libdm/libdevmapper.h 2010/01/07 19:54:22 1.104
+++ LVM2/libdm/libdevmapper.h 2010/01/11 15:36:24 1.105
@@ -1086,6 +1086,8 @@
*/
void dm_udev_set_sync_support(int sync_with_udev);
int dm_udev_get_sync_support(void);
+void dm_udev_set_checking(int checking);
+int dm_udev_get_checking(void);
int dm_udev_complete(uint32_t cookie);
int dm_udev_wait(uint32_t cookie);
--- LVM2/libdm/libdm-common.c 2009/11/13 12:43:22 1.91
+++ LVM2/libdm/libdm-common.c 2010/01/11 15:36:24 1.92
@@ -52,6 +52,7 @@
#ifdef UDEV_SYNC_SUPPORT
static int _udev_running = -1;
static int _sync_with_udev = 1;
+static int _udev_checking = 1;
#endif
/*
@@ -428,7 +429,8 @@
dev_name);
return 0;
}
- } else if (dm_udev_get_sync_support() && check_udev)
+ } else if (dm_udev_get_sync_support() && dm_udev_get_checking() &&
+ check_udev)
log_warn("%s not set up by udev: Falling back to direct "
"node creation.", path);
@@ -462,7 +464,8 @@
if (stat(path, &info) < 0)
return 1;
- else if (dm_udev_get_sync_support() && check_udev)
+ else if (dm_udev_get_sync_support() && dm_udev_get_checking() &&
+ check_udev)
log_warn("Node %s was not removed by udev. "
"Falling back to direct node removal.", path);
@@ -492,7 +495,8 @@
"is already present", newpath);
return 0;
}
- else if (dm_udev_get_sync_support() && check_udev) {
+ else if (dm_udev_get_sync_support() && dm_udev_get_checking() &&
+ check_udev) {
if (stat(oldpath, &info) < 0 &&
errno == ENOENT)
/* assume udev already deleted this */
@@ -516,7 +520,8 @@
return 0;
}
}
- else if (dm_udev_get_sync_support() && check_udev)
+ else if (dm_udev_get_sync_support() && dm_udev_get_checking() &&
+ check_udev)
log_warn("The node %s should have been renamed to %s "
"by udev but new node is not present. "
"Falling back to direct node rename.",
@@ -884,6 +889,15 @@
return 0;
}
+void dm_udev_set_checking(int checking)
+{
+}
+
+int dm_udev_get_checking(void)
+{
+ return 0;
+}
+
int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags)
{
if (dm_cookie_supported())
@@ -963,6 +977,19 @@
return dm_cookie_supported() && _udev_running && _sync_with_udev;
}
+void dm_udev_set_checking(int checking)
+{
+ if ((_udev_checking = checking))
+ log_debug("DM udev checking enabled");
+ else
+ log_debug("DM udev checking disabled");
+}
+
+int dm_udev_get_checking(void)
+{
+ return _udev_checking;
+}
+
static int _get_cookie_sem(uint32_t cookie, int *semid)
{
if (cookie >> 16 != DM_COOKIE_MAGIC) {
--- LVM2/tools/dmsetup.c 2010/01/07 19:45:12 1.131
+++ LVM2/tools/dmsetup.c 2010/01/11 15:36:25 1.132
@@ -3158,6 +3158,7 @@
struct command *c;
int r = 1;
const char *dev_dir;
+ const char *disable_udev_checking;
(void) setlocale(LC_ALL, "");
@@ -3207,6 +3208,11 @@
if (_switches[NOUDEVSYNC_ARG])
dm_udev_set_sync_support(0);
+ disable_udev_checking = getenv("DM_UDEV_DISABLE_CHECKING");
+ if ((disable_udev_checking && *disable_udev_checking) &&
+ !strcmp(disable_udev_checking, "1"))
+ dm_udev_set_checking(0);
+
doit:
if (!c->fn(argc, argv, NULL)) {
fprintf(stderr, "Command failed\n");
^ permalink raw reply [flat|nested] 5+ messages in thread
* LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li ...
@ 2009-06-09 16:10 mbroz
0 siblings, 0 replies; 5+ messages in thread
From: mbroz @ 2009-06-09 16:10 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mbroz@sourceware.org 2009-06-09 16:10:25
Modified files:
. : WHATS_NEW_DM
libdm : .exported_symbols libdevmapper.h
libdm-deptree.c
Log message:
Support crypt segment in libdevmapper tree.
- it can support multiple segments, but note that
to work properly, correct IV (initialization vector)
offset parameter must be set properly.
Because most usage of IV start offset is when we join
several crypto segments together (so iv_offset is the segment
start offset), DM_CRYPT_IV_DEFAULT is defined to simplify
the process.
Function accepts the string in cipher agrument (already
including chainmode and iv type; chainmode and iv parameters are NULL
in this case) or user can provide split parameters which will
join into dm-crypt cipher specification "cipher-chainmode-iv".
All these parameters must be supplied in correct dm-crypt format.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW_DM.diff?cvsroot=lvm2&r1=1.275&r2=1.276
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/.exported_symbols.diff?cvsroot=lvm2&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.88&r2=1.89
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.50&r2=1.51
--- LVM2/WHATS_NEW_DM 2009/06/04 13:23:10 1.275
+++ LVM2/WHATS_NEW_DM 2009/06/09 16:10:20 1.276
@@ -1,5 +1,6 @@
-Version 1.02.33 -
+Version 1.02.33 -
===============================
+ Add crypt target handling to libdevmapper node.
Add splitname command to dmsetup.
Add subsystem, vg_name, lv_name, lv_layer fields to dmsetup reports.
Make mempool optional in dm_split_lvm_name().
--- LVM2/libdm/.exported_symbols 2009/05/20 09:52:37 1.35
+++ LVM2/libdm/.exported_symbols 2009/06/09 16:10:24 1.36
@@ -67,6 +67,7 @@
dm_tree_node_add_zero_target
dm_tree_node_add_linear_target
dm_tree_node_add_striped_target
+dm_tree_node_add_crypt_target
dm_tree_node_add_mirror_target
dm_tree_node_add_mirror_target_log
dm_tree_node_add_target_area
--- LVM2/libdm/libdevmapper.h 2009/06/03 11:40:23 1.88
+++ LVM2/libdm/libdevmapper.h 2009/06/09 16:10:24 1.89
@@ -374,6 +374,21 @@
int dm_tree_node_add_striped_target(struct dm_tree_node *node,
uint64_t size,
uint32_t stripe_size);
+
+#define DM_CRYPT_IV_DEFAULT UINT64_C(-1) /* iv_offset == seg offset */
+/*
+ * Function accepts one string in cipher specification
+ * (chainmode and iv should be NULL because included in cipher string)
+ * or
+ * separate arguments which will be joined to "cipher-chainmode-iv"
+ */
+int dm_tree_node_add_crypt_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *cipher,
+ const char *chainmode,
+ const char *iv,
+ uint64_t iv_offset,
+ const char *key);
int dm_tree_node_add_mirror_target(struct dm_tree_node *node,
uint64_t size);
--- LVM2/libdm/libdm-deptree.c 2009/05/20 09:52:37 1.50
+++ LVM2/libdm/libdm-deptree.c 2009/06/09 16:10:25 1.51
@@ -28,7 +28,8 @@
/* Supported segment types */
enum {
- SEG_ERROR,
+ SEG_CRYPT,
+ SEG_ERROR,
SEG_LINEAR,
SEG_MIRRORED,
SEG_SNAPSHOT,
@@ -43,6 +44,7 @@
unsigned type;
const char *target;
} dm_segtypes[] = {
+ { SEG_CRYPT, "crypt" },
{ SEG_ERROR, "error" },
{ SEG_LINEAR, "linear" },
{ SEG_MIRRORED, "mirror" },
@@ -69,8 +71,8 @@
uint64_t size;
- unsigned area_count; /* Linear + Striped + Mirrored */
- struct dm_list areas; /* Linear + Striped + Mirrored */
+ unsigned area_count; /* Linear + Striped + Mirrored + Crypt */
+ struct dm_list areas; /* Linear + Striped + Mirrored + Crypt */
uint32_t stripe_size; /* Striped */
@@ -85,6 +87,12 @@
unsigned mirror_area_count; /* Mirror */
uint32_t flags; /* Mirror log */
char *uuid; /* Clustered mirror log */
+
+ const char *cipher; /* Crypt */
+ const char *chainmode; /* Crypt */
+ const char *iv; /* Crypt */
+ uint64_t iv_offset; /* Crypt */
+ const char *key; /* Crypt */
};
/* Per-device properties */
@@ -1328,6 +1336,13 @@
case SEG_STRIPED:
EMIT_PARAMS(pos, "%u %u", seg->area_count, seg->stripe_size);
break;
+ case SEG_CRYPT:
+ EMIT_PARAMS(pos, "%s%s%s%s%s %s %" PRIu64, seg->cipher,
+ seg->chainmode ? "-" : "", seg->chainmode ?: "",
+ seg->iv ? "-" : "", seg->iv ?: "", seg->key,
+ seg->iv_offset != DM_CRYPT_IV_DEFAULT ?
+ seg->iv_offset : *seg_start);
+ break;
}
switch(seg->type) {
@@ -1336,6 +1351,7 @@
case SEG_SNAPSHOT_ORIGIN:
case SEG_ZERO:
break;
+ case SEG_CRYPT:
case SEG_LINEAR:
case SEG_MIRRORED:
case SEG_STRIPED:
@@ -1673,6 +1689,28 @@
return 1;
}
+int dm_tree_node_add_crypt_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *cipher,
+ const char *chainmode,
+ const char *iv,
+ uint64_t iv_offset,
+ const char *key)
+{
+ struct load_segment *seg;
+
+ if (!(seg = _add_segment(node, SEG_CRYPT, size)))
+ return_0;
+
+ seg->cipher = cipher;
+ seg->chainmode = chainmode;
+ seg->iv = iv;
+ seg->iv_offset = iv_offset;
+ seg->key = key;
+
+ return 1;
+}
+
int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node,
uint32_t region_size,
unsigned clustered,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-04-20 13:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-06 0:43 LVM2 ./WHATS_NEW_DM libdm/.exported_symbols li agk
-- strict thread matches above, loose matches on Subject: below --
2010-04-20 13:58 agk
2010-02-15 16:21 prajnoha
2010-01-11 15:36 prajnoha
2009-06-09 16:10 mbroz
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).