Date: Tue, 18 May 2004 14:10:42 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 53009 for review Message-ID: <200405182110.i4ILAgFu024951@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=53009 Change 53009 by peter@peter_daintree on 2004/05/18 14:10:39 IFC @53006 Affected files ... .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/lockf.3#3 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/flock.2#3 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#51 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#69 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.8#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#8 integrate .. //depot/projects/hammer/sbin/gconcat/gconcat.8#2 integrate .. //depot/projects/hammer/sbin/idmapd/idmapd.8#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#23 integrate .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.8#4 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#4 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#2 integrate .. //depot/projects/hammer/share/man/man7/security.7#6 integrate .. //depot/projects/hammer/share/man/man9/Makefile#33 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_attach.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_bio.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_data.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_event.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_geom.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_provider.9#4 integrate .. //depot/projects/hammer/share/man/man9/g_provider_by_name.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_wither_geom.9#3 integrate .. //depot/projects/hammer/share/man/man9/rman.9#3 integrate .. //depot/projects/hammer/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#85 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#41 integrate .. //depot/projects/hammer/sys/amd64/include/_stdint.h#5 integrate .. //depot/projects/hammer/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/conf/files.pc98#29 integrate .. //depot/projects/hammer/sys/conf/options.pc98#21 integrate .. //depot/projects/hammer/sys/ddb/db_elf.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#25 integrate .. //depot/projects/hammer/sys/dev/md/md.c#31 integrate .. //depot/projects/hammer/sys/i386/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#38 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/hammer/sys/powerpc/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#13 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#22 integrate .. //depot/projects/hammer/usr.bin/Makefile#31 integrate .. //depot/projects/hammer/usr.bin/gprof/amd64.c#1 branch .. //depot/projects/hammer/usr.bin/gprof/amd64.h#1 branch .. //depot/projects/hammer/usr.bin/gprof/gprof.h#6 integrate .. //depot/projects/hammer/usr.bin/id/id.1#3 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.1#5 integrate .. //depot/projects/hammer/usr.bin/m4/gnum4.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#23 integrate Differences ... ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.11 2004/04/26 23:37:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.12 2004/05/18 18:16:30 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -209,12 +209,12 @@ header = h; - /* This distinguishes POSIX formats from GNU tar formats. */ + /* Recognize POSIX formats. */ if ((memcmp(header->magic, "ustar\0", 6) == 0) &&(memcmp(header->version, "00", 2)==0)) bid += 56; - /* Recognize GNU tar format as well. */ + /* Recognize GNU tar format. */ if ((memcmp(header->magic, "ustar ", 6) == 0) &&(memcmp(header->version, " \0", 2)==0)) bid += 56; @@ -593,6 +593,22 @@ */ if (st->st_size > 0) st->st_mode |= S_IFREG; + /* + * A tricky point: Traditionally, tar programs have + * ignored the size field when reading hardlink + * entries. As a result, some programs write non-zero + * sizes, even though the body is empty and expect the + * reader to ignore that. POSIX.1-2001 broke this by + * permitting hardlink entries to store valid bodies + * in pax interchange format. Since there is no hard + * and fast way to distinguish pax interchange from + * earlier archives (the 'x' and 'g' entries are + * optional, after all), we need a heuristic. Here, I + * use the bid function to test whether or not there's + * a valid header following. + */ + if (st->st_size > 0 && archive_read_format_tar_bid(a) > 50) + st->st_size = 0; break; case '2': /* Symlink */ st->st_mode |= S_IFLNK; ==== //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.5 2004/04/12 01:16:16 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.6 2004/05/18 00:13:06 kientzle Exp $"); #include <sys/stat.h> #include <errno.h> @@ -107,7 +107,8 @@ } if (mine->fd < 0) { - archive_set_error(a, errno, "Failed to open"); + archive_set_error(a, errno, "Failed to open '%s'", + mine->filename); return (ARCHIVE_FATAL); } ==== //depot/projects/hammer/lib/libc/gen/getgrent.3#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getgrent.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.23 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getgrent.3,v 1.24 2004/05/17 22:15:49 kientzle Exp $ .\" .Dd April 16, 2003 .Dt GETGRENT 3 @@ -168,9 +168,13 @@ return a pointer to a group structure on success or .Dv NULL if the entry is not found or if an error occurs. -In the latter case, +If an error does occur, .Va errno will be set. +Note that programs must explicitly set +.Va errno +to zero before calling any of these functions if they need to +distinguish between a non-existent entry and an error. The functions .Fn getgrent_r , .Fn getgrnam_r , ==== //depot/projects/hammer/lib/libc/gen/getgrent.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.31 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.32 2004/05/17 22:15:49 kientzle Exp $"); #include "namespace.h" #include <sys/param.h> @@ -307,6 +307,7 @@ free(grp_storage); if ((grp_storage_size << 1) > GRP_STORAGE_MAX) { grp_storage = NULL; + errno = ERANGE; return (NULL); } grp_storage_size <<= 1; @@ -315,6 +316,8 @@ return (NULL); } } while (res == NULL && rv == ERANGE); + if (rv != 0) + errno = rv; return (res); } ==== //depot/projects/hammer/lib/libc/gen/lockf.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/lockf.3,v 1.11 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/lockf.3,v 1.12 2004/05/17 23:09:10 yar Exp $ .\" .Dd December 19, 1997 .Dt LOCKF 3 @@ -173,10 +173,22 @@ .Pp The .Fn lockf , -.Xr fcntl 2 +.Xr fcntl 2 , and .Xr flock 2 -locks may be safely used concurrently. +locks are compatible. +Processes using different locking interfaces can cooperate +over the same file safely. +However, only one of such interfaces should be used within +the same process. +If a file is locked by a process through +.Xr flock 2 , +any record within the file will be seen as locked +from the viewpoint of another process using +.Xr fcntl 2 +or +.Fn lockf , +and vice versa. .Pp Blocking on a section is interrupted by any signal. .Sh RETURN VALUES ==== //depot/projects/hammer/lib/libc/sys/fcntl.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94 -.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.42 2003/02/05 13:36:13 charnier Exp $ +.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.43 2004/05/17 23:09:10 yar Exp $ .\" .Dd January 12, 1994 .Dt FCNTL 2 @@ -341,11 +341,26 @@ system call is recommended for applications that want to ensure the integrity of their locks when using library routines or wish to pass locks to their children. -Note that -.Xr flock 2 +.Pp +The +.Fn fcntl , +.Xr flock 2 , and +.Xr lockf 3 +locks are compatible. +Processes using different locking interfaces can cooperate +over the same file safely. +However, only one of such interfaces should be used within +the same process. +If a file is locked by a process through +.Xr flock 2 , +any record within the file will be seen as locked +from the viewpoint of another process using .Fn fcntl -locks may be safely used concurrently but +or +.Xr lockf 3 , +and vice versa. +Note that .Fn fcntl F_GETLK returns \-1 in .Fa l_pid @@ -558,6 +573,7 @@ .Xr getdtablesize 2 , .Xr open 2 , .Xr sigvec 2 , +.Xr lockf 3 , .Xr tcgetpgrp 3 , .Xr tcsetpgrp 3 .Sh HISTORY ==== //depot/projects/hammer/lib/libc/sys/flock.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)flock.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/flock.2,v 1.21 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/flock.2,v 1.22 2004/05/17 23:09:10 yar Exp $ .\" .Dd December 11, 1993 .Dt FLOCK 2 @@ -112,6 +112,25 @@ forks and the child explicitly unlocks the file, the parent will lose its lock. .Pp +The +.Fn flock , +.Xr fcntl 2 , +and +.Xr lockf 3 +locks are compatible. +Processes using different locking interfaces can cooperate +over the same file safely. +However, only one of such interfaces should be used within +the same process. +If a file is locked by a process through +.Fn flock , +any record within the file will be seen as locked +from the viewpoint of another process using +.Xr fcntl 2 +or +.Xr lockf 3 , +and vice versa. +.Pp Processes blocked awaiting a lock may be awakened by signals. .Sh RETURN VALUES .Rv -std flock @@ -141,8 +160,10 @@ .Xr close 2 , .Xr dup 2 , .Xr execve 2 , +.Xr fcntl 2 , .Xr fork 2 , -.Xr open 2 +.Xr open 2 , +.Xr lockf 3 .Sh HISTORY The .Fn flock ==== //depot/projects/hammer/lib/libutil/pw_util.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ static const char sccsid[] = "@(#)pw_util.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/lib/libutil/pw_util.c,v 1.34 2003/10/18 10:04:16 markm Exp $"; + "$FreeBSD: src/lib/libutil/pw_util.c,v 1.35 2004/05/18 15:53:58 stefanf Exp $"; #endif /* not lint */ /* @@ -266,10 +266,11 @@ /* child */ if (user == NULL) execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", - "-d", passwd_dir, tempname, NULL); + "-d", passwd_dir, tempname, (char *)NULL); else execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", - "-d", passwd_dir, "-u", user, tempname, NULL); + "-d", passwd_dir, "-u", user, tempname, + (char *)NULL); _exit(1); /* NOTREACHED */ default: @@ -321,7 +322,7 @@ (void)setuid(getuid()); } errno = 0; - execlp(editor, basename(editor), tempname, NULL); + execlp(editor, basename(editor), tempname, (char *)NULL); _exit(errno); default: /* parent */ ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#51 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.218 2004/05/09 21:27:15 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.221 2004/05/18 12:02:38 nyan Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -86,7 +86,7 @@ <para arch="i386,amd64">Adaptec FSA family RAID controllers (&man.aac.4; driver)</para> - <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver) + <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (&man.ct.4; driver) <itemizedlist> <listitem> <para>NEC PC-9801-55, 92 and their compatibles</para> @@ -895,6 +895,27 @@ </itemizedlist> </para> + <para arch="i386,pc98">Cronyx Tau-PCI synchronous serial adapters for PCI bus + (&man.cp.4; driver) + <itemizedlist> + <listitem> + <para>Cronyx Tau-PCI (dual RS-232/V.35) and Cronyx Tau-PCI/R (dual RS-530(RS-449)/X.21)</para> + </listitem> + <listitem> + <para>Cronyx Tau-PCI/E1 (dual fractional E1) and Cronyx Tau-PCI/G703 (dual unframed E1)</para> + </listitem> + <listitem> + <para>Cronyx Tau-PCI/2E1 (dual fractional/unframed E1)</para> + </listitem> + <listitem> + <para>Cronyx Tau-PCI/4E1 (four fractional/unframed E1)</para> + </listitem> + <listitem> + <para>Cronyx Tau-PCI/E3 (one E3)</para> + </listitem> + </itemizedlist> + </para> + <para arch="i386">Cronyx Tau synchronous serial adapters for ISA bus (&man.ctau.4; driver) <itemizedlist> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#69 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.728 2004/05/17 17:55:19 yar Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.731 2004/05/18 12:02:39 nyan Exp $</pubdate> <copyright> <year>2000</year> @@ -207,7 +207,7 @@ control display switching and backlight brightness using the ACPI Video Extensions.</para> - <para arch="i386">The &man.ctau.4; driver has been added for Cronyx-Tau + <para arch="i386">The &man.ctau.4; driver has been added for Cronyx Tau synchronous serial adapters. This driver was known for a long time as <quote>ct</quote> in its previous life outside the &os; source tree. &merged; @@ -217,6 +217,10 @@ </note> </para> + <para arch="i386,pc98">The &man.cp.4; driver has been added for Cronyx Tau-PCI + synchronous serial adapters. + </para> + <para>&man.devfs.5; path rules now work correctly on directories.</para> @@ -381,6 +385,10 @@ a simple packet distribution that acts like an Ethernet hub has been added. &merged;</para> + <para>The &man.ng.sppp.4; Netgraph node type, which is a &man.netgraph.4 + interface to the original &man.sppp.4 network module for synchronous + lines has been added.</para> + <para>The &man.ng.vlan.4; Netgraph node type, which supports IEEE 802.1Q VLAN tagging has been added. &merged;</para> ==== //depot/projects/hammer/sbin/atm/atmconfig/atmconfig.8#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" Author: Hartmut Brandt <harti@freebsd.org> +.\" Author: Hartmut Brandt <harti@FreeBSD.org> .\" -.\" $FreeBSD: src/sbin/atm/atmconfig/atmconfig.8,v 1.1 2003/08/12 14:25:56 harti Exp $ +.\" $FreeBSD: src/sbin/atm/atmconfig/atmconfig.8,v 1.2 2004/05/17 20:45:21 ru Exp $ .\" .Dd August 11, 2003 .Dt ATMCONFIG 8 @@ -37,88 +37,83 @@ .Sh SYNOPSIS .Nm .Op Fl htv -.Op command Op sub-command Op ... -.Op options -.Op arg ... +.Op Ar command Op Ar sub-command Op ... +.Op Ar options +.Op Ar arg ... .Sh DESCRIPTION The .Nm -tool is used to configure the Netgraph ATM network sub-system. +tool is used to configure the Netgraph ATM network sub-system. .Pp The command line of .Nm generally consists of common options followed by a command string, optionally followed by sub-command strings, optional command specific options and -command specific arguments. Commands and sub-commands as well as command +command specific arguments. +Commands and sub-commands as well as command specific options may be abbreviated as long as there is only one match possible. -.Ss COMMON OPTIONS +.Ss Common Options The following common options change the overall behaviour of .Nm : -.Bl -tag -width XXXX +.Bl -tag -width indent .It Fl h Print a very short usage info and exit. .It Fl t Several show-type commands output a header and then several lines of information. -If this option is given the header is omitted, simplifying the parsing +If this option is given, the header is omitted, simplifying the parsing of the output. .It Fl v Be more verbose. .El -.Ss OBTAINING HELP +.Ss Obtaining Help The -.Sq help +.Ic help command has a number of useful sub-commands. +.Pp To get general help use: +.D1 Nm Ic help .Pp -.Dl atmconfig help -.Pp To get a list of available commands use: -.Pp -.Dl atmconfig help commands +.D1 Nm Ic help Cm commands .Pp To get a list of available sub-commands use: +.D1 Nm Ic help Ar command .Pp -.Dl atmconfig help Ar command +or (if there are deeper levels of sub-commands): +.D1 Nm Ic help Ar command sub-command ... .Pp -or (if there are deeper levels of sub-commands +To get a list of options and arguments for a command use: +.D1 Nm Ic help Ar command sub-command ... +(given that there are no further sub-command levels). .Pp -.Dl atmconfig help Ar command Ar sub-command ... -.Pp -To get a list of options and arguments for a command use -.Pp -.Dl atmconfig help Ar command Ar sub-command ... -.Pp -(given, that there are no further sub-command levels). -To get a list of common options use -.Pp -.Dl atmconfig help options -.Ss DIAG COMMAND +To get a list of common options use: +.D1 Nm Ic help Cm options +.Ss The Ic diag Ss Command The .Ic diag command allows the inspection of the ATM interfaces on the local host and the modification of device parameters. Sub-commands are: -.Ic list +.Cm list (print a list of interfaces), -.Ic config +.Cm config (print hardware configuration), -.Ic phy +.Cm phy (access PHY chip), -.Ic stats +.Cm stats (print statistics) and -.Ic vcc +.Cm vcc (print list of VCCs). -.Pp -.Bl -tag -width XXXX +.Bl -tag -width indent .\"---------------------------------------- -.It Ic atmconfig diag list +.It Nm Ic diag Cm list This sub-command lists all ATM interfaces in the system. It takes no options or arguments. .\"---------------------------------------- .It Xo -.Ic atmconfig diag config +.Nm Ic diag Cm config .Op Fl atm .Op Fl hardware .Op Ar device ... @@ -126,7 +121,7 @@ This command prints the configuration of ATM interfaces. If no .Ar device -is given all devices are listed, otherwise only the specified devices. +is given, all devices are listed, otherwise only the specified devices. The option .Fl atm instructs the command to print ATM layer configuration parameters like @@ -134,11 +129,11 @@ .Fl hardware option requests card specific information like the vendor or the serial number. -If none of the options is given the defaults is to assume +If none of the options is given, the defaults is to assume .Fl atm . .\"---------------------------------------- .It Xo -.Ic atmconfig diag phy print +.Nm Ic diag Cm phy print .Op Fl numeric .Ar device .Xc @@ -146,18 +141,15 @@ human comprehensible format. If .Fl numeric -is given the format are hex bytes. -Otherwise textual representation will be printed. +is given, the format is hex bytes. +Otherwise, textual representation will be printed. .\"---------------------------------------- -.It Xo -.Ic atmconfig diag phy show -.Op Ar device ... -.Xc +.It Nm Ic diag Cm phy show Op Ar device ... This sub-command prints static information about the PHY device used in the ATM card like the type of the PHY and the media. .\"---------------------------------------- .It Xo -.Ic atmconfig diag phy set +.Nm Ic diag Cm phy set .Ar device .Ar reg .Ar mask @@ -174,7 +166,7 @@ are written back with their original value. .\"---------------------------------------- .It Xo -.Ic atmconfig diag phy stats +.Nm Ic diag Cm phy stats .Op Fl clear .Ar device .Xc @@ -185,7 +177,7 @@ is given, the statistics are cleared atomically. .\"---------------------------------------- .It Xo -.Ic atmconfig diag vcc +.Nm Ic diag Cm vcc .Op Fl abr .Op Fl channel .Op Fl traffic @@ -193,12 +185,10 @@ .Xc Retrieve the list of currently active channels on either all or the specified interfaces. -For each channel the following information is printed depending +For each channel, the following information is printed depending on the options (default is -.Fl channel -). -.Pp -.Bl -tag -width XXXX +.Fl channel ) . +.Bl -tag -width ".Fl traffic" .It Fl abr Print ABR specific traffic parameters: ICR, TBE, NRM, TRM, ADTF, RIF, RDF, CDF. @@ -208,30 +198,27 @@ Print traffic parameters: PCR, SCR, MBS, MCR. .El .\"---------------------------------------- -.It Xo -.Ic atmconfig diag stats -.Ar device -.Xc +.It Nm Ic diag Cm stats Ar device Print driver specific statistics. .El -.Ss NATM COMMAND +.Ss The Ic natm Ss Command The .Ic natm command is used to change .Xr natmip 4 routes on the local host. The sub-commands for the routing table are: -.Ic add +.Cm add (to add a new route), -.Ic delete +.Cm delete (to delete an existing route) and -.Ic show +.Cm show (to print the currently installed NATM routes). .Pp -.Bl -tag -width XXXX +.Bl -tag -width indent -compact .\"---------------------------------------- .It Xo -.Ic atmconfig natm add +.Nm Ic natm Cm add .Ar dest .Ar device .Ar vpi @@ -239,55 +226,59 @@ .Ar encaps .Xc .It Xo -.Ic atmconfig natm add +.Nm Ic natm Cm add .Ar dest .Ar device .Ar vpi .Ar vci .Ar encaps -.Ic ubr Oo Ar pcr Oc +.Cm ubr Op Ar pcr .Xc .It Xo -.Ic atmconfig natm add +.Nm Ic natm Cm add .Ar dest .Ar device .Ar vpi .Ar vci .Ar encaps -.Ic cbr Ar pcr +.Cm cbr Ar pcr .Xc .It Xo -.Ic atmconfig natm add +.Nm Ic natm Cm add .Ar dest .Ar device .Ar vpi .Ar vci .Ar encaps -.Ic vbr Ar pcr Ar scr Ar mbs +.Cm vbr Ar pcr scr mbs .Xc .It Xo -.Ic atmconfig natm add +.Nm Ic natm Cm add .Ar dest .Ar device .Ar vpi .Ar vci .Ar encaps -.Ic abr Ar pcr Ar mcr Ar icr Ar tbe Ar nrm Ar trm Ar adtf Ar rif Ar rdf Ar cdf +.Cm abr Ar pcr mcr icr tbe nrm trm adtf rif rdf cdf .Xc -.Pp -Add a new route to the routing table. The destination address (the address +Add a new route to the routing table. +The destination address (the address on the other end of the link) is given in .Ar dest . +The .Ar device , .Ar vpi and .Ar vci +arguments are the name of the ATM device and the VPI and VCI values for the link. +The .Ar encaps +argument may be either -.Ic AAL5 +.Cm AAL5 or -.Ic LLC/SNAP +.Cm LLC/SNAP both of which specify AAL5 encapsulation, the first one without additional encapsulation, the second one with LLC/SNAP headers. The first two forms of the command add an UBR (unspecified bit rate) channel, @@ -300,28 +291,24 @@ maximum bursts size. The last form of the command adds an ABR (available bit rate) channel. .\"---------------------------------------- +.Pp +.It Nm Ic natm Cm delete Ar dest .It Xo -.Ic atmconfig natm delete -.Ar dest -.Xc -.It Xo -.Ic atmconfig natm delete +.Nm Ic natm Cm delete .Ar device .Ar vpi .Ar vci .Xc -.Pp This commands deletes an NATM route. The route may be specified either by the destination address or by the -.Ar device , -.Ar vpi and +.Ar device , vpi +and .Ar vci triple. .\"---------------------------------------- -.It Xo -.Ic atmconfig natm show -.Xc +.Pp +.It Nm Ic natm Cm show List all NATM routes. .El .Sh SEE ALSO @@ -329,4 +316,4 @@ .Xr natmip 4 , .Xr atm 8 .Sh AUTHORS -.An Hartmut Brandt Aq harti@freebsd.org +.An Hartmut Brandt Aq harti@FreeBSD.org ==== //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.23 2004/04/09 19:58:28 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.24 2004/05/18 19:51:41 scottl Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -478,10 +478,9 @@ slowio_start() { - /* Delay one in every 8 operations by 16 times the average IO delay */ + /* Delay one in every 8 operations */ slowio_pollcnt = (slowio_pollcnt + 1) & 7; if (slowio_pollcnt == 0) { - usleep(slowio_delay_usec * 16); gettimeofday(&slowio_starttime, NULL); } } @@ -501,9 +500,12 @@ (tv.tv_usec - slowio_starttime.tv_usec); if (delay_usec < 64) delay_usec = 64; - if (delay_usec > 1000000) - delay_usec = 1000000; + if (delay_usec > 2500000) + delay_usec = 2500000; slowio_delay_usec = (slowio_delay_usec * 63 + delay_usec) >> 6; + /* delay by 8 times the average IO delay */ + if (slowio_delay_usec > 64) + usleep(slowio_delay_usec * 8); } /* ==== //depot/projects/hammer/sbin/gconcat/gconcat.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/gconcat/gconcat.8,v 1.1 2004/02/23 12:44:08 pjd Exp $ +.\" $FreeBSD: src/sbin/gconcat/gconcat.8,v 1.2 2004/05/17 20:58:42 ru Exp $ .\" .Dd February 22, 2004 .Dt GCONCAT 8 @@ -32,30 +32,30 @@ .Nd "disk concatenation control utility" .Sh SYNOPSIS .Nm -.Ar create +.Cm create .Op Fl v .Ar name .Ar dev1 .Ar dev2 .Op Ar dev3 Op Ar ... .Nm -.Ar label +.Cm label .Op Fl v .Ar name .Ar dev1 .Ar dev2 .Op Ar dev3 Op Ar ... .Nm -.Ar destroy +.Cm destroy .Op Fl fv .Ar name .Nm -.Ar clear +.Cm clear .Op Fl v .Ar dev1 .Op Ar dev2 Op Ar ... .Nm -.Ar list +.Cm list .Sh DESCRIPTION The .Nm @@ -66,19 +66,19 @@ .Dq automatic . When using the .Dq manual -method no metadata are stored on the devices, so the concatenated +method, no metadata are stored on the devices, so the concatenated device has to be configured by hand every time it is needed. The .Dq automatic -method use on\-disk metadata to detect devices. -Once devices are labeled they will be automatically detected and +method use on-disk metadata to detect devices. +Once devices are labeled, they will be automatically detected and configured. .Pp The first argument to .Nm -indicate an action to be performed: -.Bl -tag -width ".Ar destroy" -.It Ar create +indicates an action to be performed: +.Bl -tag -width ".Cm destroy" +.It Cm create Concatenate the given devices with specified .Ar name . This is the @@ -87,7 +87,7 @@ The kernel module .Pa geom_concat.ko will be loaded if it is not loaded already. -.It Ar label +.It Cm label Concatenate the given devices with the specified .Ar name . This is the @@ -96,26 +96,25 @@ The kernel module .Pa geom_concat.ko will be loaded if it is not loaded already. -.It Ar destroy +.It Cm destroy Turn off existing concatenate device by its .Ar name . -.It Ar clear -Clear metadata on given device(s). -.It Ar list -List currently configured device(s). +.It Cm clear +Clear metadata on given devices. +.It Cm list +List currently configured devices. .El .Pp Additional options: -.Bl -tag -width ".Fl f" +.Bl -tag -width indent .It Fl f -Force removal of specified concatenated device. +Force the removal of the specified concatenated device. .It Fl v Be more verbose. .El .Sh EXAMPLES -The following example show how to configure four disks for automatic +The following example shows how to configure four disks for automatic concatenation, create file system on it, and mount it: -.Pp .Bd -literal -offset indent gconcat label -v data /dev/da0 /dev/da1 /dev/da2 /dev/da3 newfs /dev/data.concat @@ -129,11 +128,7 @@ .Xr newfs 8 , .Xr vinum 8 .Sh AUTHORS -.An -split -The -.Nm -utility as well as this manual page was written by -.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org . +.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .Sh HISTORY The .Nm ==== //depot/projects/hammer/sbin/idmapd/idmapd.8#3 (text+ko) ==== @@ -1,7 +1,7 @@ .\" copyright (c) 2003 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405182110.i4ILAgFu024951>