* device-mapper/dmsetup dmsetup.c
@ 2006-10-12 17:09 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2006-10-12 17:09 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2006-10-12 17:09:10
Modified files:
dmsetup : dmsetup.c
Log message:
fix dmsetup usage display (missing \n and --noflush wrong place)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.72&r2=1.73
--- device-mapper/dmsetup/dmsetup.c 2006/10/12 15:42:24 1.72
+++ device-mapper/dmsetup/dmsetup.c 2006/10/12 17:09:09 1.73
@@ -1506,12 +1506,12 @@
static struct command _commands[] = {
{"create", "<dev_name> [-j|--major <major> -m|--minor <minor>]\n"
"\t [-U|--uid <uid>] [-G|--gid <gid>] [-M|--mode <octal_mode>]\n"
- "\t [-u|uuid <uuid>]"
+ "\t [-u|uuid <uuid>]\n"
"\t [--notable | --table <table> | <table_file>]",
1, 2, _create},
{"remove", "[-f|--force] <device>", 0, 1, _remove},
{"remove_all", "[-f|--force]", 0, 0, _remove_all},
- {"suspend", "<device>", 0, 1, _suspend},
+ {"suspend", "[--noflush] <device>", 0, 1, _suspend},
{"resume", "<device>", 0, 1, _resume},
{"load", "<device> [<table_file>]", 0, 2, _load},
{"clear", "<device>", 0, 1, _clear},
@@ -1537,8 +1537,7 @@
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
- " [-r|--readonly] [--noopencount] [--nolockfs]\n"
- " [--noflush]\n\n");
+ " [-r|--readonly] [--noopencount] [--nolockfs]\n\n");
for (i = 0; _commands[i].name; i++)
fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
fprintf(out, "\n<device> may be device name or -u <uuid> or "
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-01-29 18:37 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-01-29 18:37 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-01-29 18:37:58
Modified files:
dmsetup : dmsetup.c
Log message:
add help -c for field list
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.82&r2=1.83
--- device-mapper/dmsetup/dmsetup.c 2007/01/29 18:18:41 1.82
+++ device-mapper/dmsetup/dmsetup.c 2007/01/29 18:37:57 1.83
@@ -1625,7 +1625,7 @@
if (_switches[SORT_ARG] && _string_args[SORT_ARG]) {
keys = _string_args[SORT_ARG];
buffered = 1;
- if (!strcmp(c->name, "status") || !strcmp(c->name, "table")) {
+ if (c && (!strcmp(c->name, "status") || !strcmp(c->name, "table"))) {
err("--sort is not yet supported with status and table");
goto out;
}
@@ -1714,12 +1714,13 @@
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
" [-r|--readonly] [--noopencount] [--nolockfs]\n"
- " [-c|--columns] [-o <fields>] [--noheadings] [--separator <separator>]\n\n");
+ " [-c|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
+ " [--noheadings] [--separator <separator>]\n\n");
for (i = 0; _commands[i].name; i++)
fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
fprintf(out, "\n<device> may be device name or -u <uuid> or "
"-j <major> -m <minor>\n");
- fprintf(out, "<fields> are comma-separated. Use -c -o help for list.\n");
+ fprintf(out, "<fields> are comma-separated. Use 'help -c' for list.\n");
fprintf(out, "Table_file contents may be supplied on stdin.\n");
fprintf(out, "Tree options are: ascii, utf, vt100; compact, inverted, notrunc;\n"
" [no]device, active, open, rw and uuid.\n");
@@ -1738,6 +1739,14 @@
{
_usage(stderr);
+ if (_switches[COLS_ARG]) {
+ _switches[OPTIONS_ARG] = 1;
+ _string_args[OPTIONS_ARG] = (char *) "help";
+ _switches[SORT_ARG] = 0;
+
+ (void) _report_init(NULL);
+ }
+
return 1;
}
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-01-29 18:43 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-01-29 18:43 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-01-29 18:43:27
Modified files:
dmsetup : dmsetup.c
Log message:
help unused attr
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.83&r2=1.84
--- device-mapper/dmsetup/dmsetup.c 2007/01/29 18:37:57 1.83
+++ device-mapper/dmsetup/dmsetup.c 2007/01/29 18:43:27 1.84
@@ -1735,7 +1735,9 @@
"[-o offset] [-f|loop_device] [file]\n\n");
}
-static int _help(int argc, char **argv, void *data)
+static int _help(int argc __attribute((unused)),
+ char **argv __attribute((unused)),
+ void *data __attribute((unused)))
{
_usage(stderr);
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-01-29 18:45 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-01-29 18:45 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-01-29 18:45:08
Modified files:
dmsetup : dmsetup.c
Log message:
help on help
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.84&r2=1.85
--- device-mapper/dmsetup/dmsetup.c 2007/01/29 18:43:27 1.84
+++ device-mapper/dmsetup/dmsetup.c 2007/01/29 18:45:08 1.85
@@ -1679,7 +1679,7 @@
* Dispatch table
*/
static struct command _commands[] = {
- {"help", "\n", 0, 0, _help},
+ {"help", "[-c|-C|--columns]", 0, 0, _help},
{"create", "<dev_name> [-j|--major <major> -m|--minor <minor>]\n"
"\t [-U|--uid <uid>] [-G|--gid <gid>] [-M|--mode <octal_mode>]\n"
"\t [-u|uuid <uuid>]\n"
@@ -1714,7 +1714,7 @@
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
" [-r|--readonly] [--noopencount] [--nolockfs]\n"
- " [-c|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
+ " [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
" [--noheadings] [--separator <separator>]\n\n");
for (i = 0; _commands[i].name; i++)
fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-04-27 18:01 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-04-27 18:01 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-04-27 19:01:46
Modified files:
dmsetup : dmsetup.c
Log message:
configure.h isn't a system header
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.89&r2=1.90
--- device-mapper/dmsetup/dmsetup.c 2007/04/27 15:12:26 1.89
+++ device-mapper/dmsetup/dmsetup.c 2007/04/27 18:01:45 1.90
@@ -19,7 +19,7 @@
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
-#include <configure.h>
+#include "configure.h"
#include "libdevmapper.h"
#include "log.h"
^ permalink raw reply [flat|nested] 10+ messages in thread
* device-mapper/dmsetup dmsetup.c
@ 2007-06-19 16:50 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-06-19 16:50 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-06-19 16:50:38
Modified files:
dmsetup : dmsetup.c
Log message:
revert accidental change
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.93&r2=1.94
--- device-mapper/dmsetup/dmsetup.c 2007/06/19 15:47:20 1.93
+++ device-mapper/dmsetup/dmsetup.c 2007/06/19 16:50:38 1.94
@@ -1662,7 +1662,7 @@
name = dm_tree_node_get_name(parent);
if (!name || !*name)
continue;
- if (!first_node && !dm_pool_grow_object(mem, ",", 2)) {
+ if (!first_node && !dm_pool_grow_object(mem, ",", 1)) {
log_error("dm_pool_grow_object failed");
goto out_abandon;
}
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-12-03 22:53 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-12-03 22:53 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-12-03 22:53:04
Modified files:
dmsetup : dmsetup.c
Log message:
fixme
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.100&r2=1.101
--- device-mapper/dmsetup/dmsetup.c 2007/12/03 22:48:35 1.100
+++ device-mapper/dmsetup/dmsetup.c 2007/12/03 22:53:04 1.101
@@ -339,6 +339,7 @@
info->suspended ? "SUSPENDED" : "ACTIVE",
info->read_only ? " (READ-ONLY)" : "");
+ /* FIXME Old value is being printed when it's being changed. */
if (dm_task_get_read_ahead(dmt, &read_ahead))
printf("Read Ahead: %" PRIu32 "\n", read_ahead);
^ permalink raw reply [flat|nested] 10+ messages in thread* device-mapper/dmsetup dmsetup.c
@ 2007-12-05 14:42 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2007-12-05 14:42 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2007-12-05 14:42:10
Modified files:
dmsetup : dmsetup.c
Log message:
read_ahead in report with underscore to match lvm2 field
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.101&r2=1.102
--- device-mapper/dmsetup/dmsetup.c 2007/12/03 22:53:04 1.101
+++ device-mapper/dmsetup/dmsetup.c 2007/12/05 14:42:10 1.102
@@ -1881,7 +1881,7 @@
FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.")
/* FIXME Next one should be INFO */
-FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "readahead", "Read ahead in sectors.")
+FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
FIELD_F(INFO, STR, "DevNo", 5, dm_info_devno, "devno", "Device major and minor numbers")
^ permalink raw reply [flat|nested] 10+ messages in thread
* device-mapper/dmsetup dmsetup.c
@ 2008-04-21 16:57 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2008-04-21 16:57 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2008-04-21 16:57:11
Modified files:
dmsetup : dmsetup.c
Log message:
Use 'active' for !suspended as the code already uses that.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.106&r2=1.107
--- device-mapper/dmsetup/dmsetup.c 2008/04/21 13:16:30 1.106
+++ device-mapper/dmsetup/dmsetup.c 2008/04/21 16:57:11 1.107
@@ -1678,7 +1678,7 @@
if (info->suspended)
dm_report_field_set_value(field, "Suspended", NULL);
else
- dm_report_field_set_value(field, "", NULL);
+ dm_report_field_set_value(field, "Active", NULL);
return 1;
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* device-mapper/dmsetup dmsetup.c
@ 2008-10-30 17:52 agk
0 siblings, 0 replies; 10+ messages in thread
From: agk @ 2008-10-30 17:52 UTC (permalink / raw)
To: dm-cvs, dm-devel
CVSROOT: /cvs/dm
Module name: device-mapper
Changes by: agk@sourceware.org 2008-10-30 17:52:07
Modified files:
dmsetup : dmsetup.c
Log message:
drop explicit libdevmapper.h
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.112&r2=1.113
--- device-mapper/dmsetup/dmsetup.c 2008/10/30 17:24:03 1.112
+++ device-mapper/dmsetup/dmsetup.c 2008/10/30 17:52:06 1.113
@@ -21,7 +21,6 @@
#include "configure.h"
-#include "libdevmapper.h"
#include "dm-logging.h"
#include <stdio.h>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-10-30 17:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-12 17:09 device-mapper/dmsetup dmsetup.c agk
-- strict thread matches above, loose matches on Subject: below --
2007-01-29 18:37 agk
2007-01-29 18:43 agk
2007-01-29 18:45 agk
2007-04-27 18:01 agk
2007-06-19 16:50 agk
2007-12-03 22:53 agk
2007-12-05 14:42 agk
2008-04-21 16:57 agk
2008-10-30 17:52 agk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.