From 30323b253fca808559d12aeaf317d874360c496d Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Thu, 6 Apr 2006 16:20:40 +0000 Subject: [PATCH] Bring dmsetup man page up-to-date. --- WHATS_NEW_DM | 1 + man/dmsetup.8.in | 16 +++++++++++++--- tools/dmsetup.c | 6 ++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 784413370..2fdbf695a 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.04 - ============================ + Bring dmsetup man page up-to-date. Use name-based device refs if kernel doesn't support device number refs. Fix memory leak (struct dm_ioctl) when struct dm_task is reused. If _create_and_load_v4 fails part way through, revert the creation. diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index 65922ea29..a58dd1582 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -1,4 +1,4 @@ -.TH DMSETUP 8 "Sep 17 2003" "Linux" "MAINTENTANCE COMMANDS" +.TH DMSETUP 8 "Apr 06 2006" "Linux" "MAINTENTANCE COMMANDS" .SH NAME dmsetup \- low level logical volume management .SH SYNOPSIS @@ -12,7 +12,7 @@ dmsetup \- low level logical volume management .B dmsetup remove_all .br .B dmsetup suspend -.I device_name +.I [--nolockfs] device_name .br .B dmsetup resume .I device_name @@ -29,7 +29,7 @@ dmsetup \- low level logical volume management .B dmsetup rename .I device_name new_name .br -.B dmsetup ls [--target target_type] [--exec command] +.B dmsetup ls [--target target_type] [--exec command] [--tree [-o options]] .br .B dmsetup info .I [device_name] @@ -147,10 +147,17 @@ Outputs some brief information about the device in the form: .IP \fBls .I [--target target_type] .I [--exec command] +.I [--tree [-o options]] .br List device names. Optionally only list devices that have at least one target of the specified type. Optionally execute a command for each device. The device name is appended to the supplied command. +--tree displays dependencies between devices as a tree. +It accepts a comma-separate list of options. +Some specify the information displayed against each node: +device/nodevice; active, open, rw, uuid. +Others specify how the tree is displayed: +ascii, utf, vt100; compact, inverted, notrunc. .IP \fBload|reload .I device_name [table_file] .br @@ -183,11 +190,14 @@ Outputs status information for each of the device's targets. With --target, only information relating to the specified target type is displayed. .IP \fBsuspend +.I [--nolockfs] .I device_name .br Suspends a device. Any I/O that has already been mapped by the device but has not yet completed will be flushed. Any further I/O to that device will be postponed for as long as the device is suspended. +If there's a filesystem on the device which supports the operation, +an attempt will be made to sync it first unless --nolockfs is specified. .IP \fBtable .I [--target target_type] .I [device_name] diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 7d37c3c9d..fcf0b9495 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -1350,7 +1350,7 @@ static struct command _commands[] = { {"reload", " []", 0, 2, _load}, {"rename", " ", 1, 2, _rename}, {"message", " ", 2, -1, _message}, - {"ls", "[--target ] [--exec ] [--tree]", 0, 0, _ls}, + {"ls", "[--target ] [--exec ] [--tree [-o options]]", 0, 0, _ls}, {"info", "[]", 0, 1, _info}, {"deps", "[]", 0, 1, _deps}, {"status", "[] [--target ]", 0, 1, _status}, @@ -1374,7 +1374,9 @@ static void _usage(FILE *out) fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help); fprintf(out, "\n may be device name or -u or " "-j -m \n"); - fprintf(out, "Table_file contents may be supplied on stdin.\n\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\n"); return; }