From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 6 01:00:40 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FF39106564A; Sun, 6 Feb 2011 01:00:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3AD8FC08; Sun, 6 Feb 2011 01:00:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1610es6047342; Sun, 6 Feb 2011 01:00:40 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1610ekh047340; Sun, 6 Feb 2011 01:00:40 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201102060100.p1610ekh047340@svn.freebsd.org> From: Ed Maste Date: Sun, 6 Feb 2011 01:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218361 - stable/7/sys/dev/aac X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 01:00:40 -0000 Author: emaste Date: Sun Feb 6 01:00:40 2011 New Revision: 218361 URL: http://svn.freebsd.org/changeset/base/218361 Log: MFC r218207: Revert part of r173264. Both aac_ioctl_sendfib and aac_ioctl_send_raw_srb make use of the aac_ioctl_event callback, if acc_alloc_command fails. This can end up in an infinite loop in the while loop in aac_release_command. Modified: stable/7/sys/dev/aac/aac.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/aac/aac.c ============================================================================== --- stable/7/sys/dev/aac/aac.c Sat Feb 5 23:32:17 2011 (r218360) +++ stable/7/sys/dev/aac/aac.c Sun Feb 6 01:00:40 2011 (r218361) @@ -1411,11 +1411,7 @@ aac_release_command(struct aac_command * aac_enqueue_free(cm); - /* - * Dequeue all events so that there's no risk of events getting - * stranded. - */ - while ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { + if ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { TAILQ_REMOVE(&sc->aac_ev_cmfree, event, ev_links); event->ev_callback(sc, event, event->ev_arg); } From owner-svn-src-stable-7@FreeBSD.ORG Mon Feb 7 11:13:29 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37CD81065697; Mon, 7 Feb 2011 11:13:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C4C7A8FC16; Mon, 7 Feb 2011 11:13:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p17BDSo6007542; Mon, 7 Feb 2011 11:13:28 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17BDS40007540; Mon, 7 Feb 2011 11:13:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102071113.p17BDS40007540@svn.freebsd.org> From: Glen Barber Date: Mon, 7 Feb 2011 11:13:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218396 - stable/7/share/man/man7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 11:13:31 -0000 Author: gjb (doc committer) Date: Mon Feb 7 11:13:28 2011 New Revision: 218396 URL: http://svn.freebsd.org/changeset/base/218396 Log: MFC 214374: Minor grammar fixes. Approved by: keramida (mentor) Modified: stable/7/share/man/man7/build.7 Directory Properties: stable/7/share/man/man7/ (props changed) Modified: stable/7/share/man/man7/build.7 ============================================================================== --- stable/7/share/man/man7/build.7 Mon Feb 7 11:12:27 2011 (r218395) +++ stable/7/share/man/man7/build.7 Mon Feb 7 11:13:28 2011 (r218396) @@ -385,7 +385,7 @@ defaults to the current machine architec .Pp Builds under directory .Pa /usr/src -are also influenced by defining one or more the following symbols, +are also influenced by defining one or more of the following symbols, using the .Fl D option of From owner-svn-src-stable-7@FreeBSD.ORG Mon Feb 7 19:13:20 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66BEB10656A8; Mon, 7 Feb 2011 19:13:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 56AA38FC12; Mon, 7 Feb 2011 19:13:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p17JDKvW019612; Mon, 7 Feb 2011 19:13:20 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17JDKlk019610; Mon, 7 Feb 2011 19:13:20 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102071913.p17JDKlk019610@svn.freebsd.org> From: Glen Barber Date: Mon, 7 Feb 2011 19:13:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218413 - stable/7/sbin/newfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 19:13:20 -0000 Author: gjb (doc committer) Date: Mon Feb 7 19:13:20 2011 New Revision: 218413 URL: http://svn.freebsd.org/changeset/base/218413 Log: MFC 212610: Synchronize newfs(8) manual with code. PR: 61716 Approved by: keramida (mentor) Modified: stable/7/sbin/newfs/newfs.8 Directory Properties: stable/7/sbin/newfs/ (props changed) Modified: stable/7/sbin/newfs/newfs.8 ============================================================================== --- stable/7/sbin/newfs/newfs.8 Mon Feb 7 19:12:30 2011 (r218412) +++ stable/7/sbin/newfs/newfs.8 Mon Feb 7 19:13:20 2011 (r218413) @@ -28,7 +28,7 @@ .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 .\" $FreeBSD$ .\" -.Dd March 21, 2008 +.Dd September 14, 2010 .Dt NEWFS 8 .Os .Sh NAME @@ -116,8 +116,9 @@ and the number of bytes per inode. .It Fl d Ar max-extent-size The file system may choose to store large files using extents. This parameter specifies the largest extent size that may be used. -It is presently limited to its default value which is 16 times -the file system blocksize. +The default value is the file system blocksize. +It is presently limited to a maximum value of 16 times the +file system blocksize and a minimum value of the file system blocksize. .It Fl e Ar maxbpg Indicate the maximum number of blocks any single file can allocate out of a cylinder group before it is forced to begin From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 8 11:48:47 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C72106564A; Tue, 8 Feb 2011 11:48:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3DFF8FC16; Tue, 8 Feb 2011 11:48:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p18BmlVZ044747; Tue, 8 Feb 2011 11:48:47 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18BmlDS044743; Tue, 8 Feb 2011 11:48:47 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201102081148.p18BmlDS044743@svn.freebsd.org> From: Xin LI Date: Tue, 8 Feb 2011 11:48:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218434 - stable/7/usr.sbin/rtadvd X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 11:48:48 -0000 Author: delphij Date: Tue Feb 8 11:48:47 2011 New Revision: 218434 URL: http://svn.freebsd.org/changeset/base/218434 Log: MFC r216675: Allow overriding pidfile and dumpfile. PR: bin/153362 Submitted by: Joe Holden Modified: stable/7/usr.sbin/rtadvd/Makefile stable/7/usr.sbin/rtadvd/rtadvd.8 stable/7/usr.sbin/rtadvd/rtadvd.c Directory Properties: stable/7/usr.sbin/rtadvd/ (props changed) Modified: stable/7/usr.sbin/rtadvd/Makefile ============================================================================== --- stable/7/usr.sbin/rtadvd/Makefile Tue Feb 8 11:48:37 2011 (r218433) +++ stable/7/usr.sbin/rtadvd/Makefile Tue Feb 8 11:48:47 2011 (r218434) @@ -18,6 +18,9 @@ PROG= rtadvd MAN= rtadvd.conf.5 rtadvd.8 SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c +DPADD= ${LIBUTIL} +LDADD= -lutil + CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO .include Modified: stable/7/usr.sbin/rtadvd/rtadvd.8 ============================================================================== --- stable/7/usr.sbin/rtadvd/rtadvd.8 Tue Feb 8 11:48:37 2011 (r218433) +++ stable/7/usr.sbin/rtadvd/rtadvd.8 Tue Feb 8 11:48:47 2011 (r218434) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 17, 1998 +.Dd December 22, 2010 .Dt RTADVD 8 .Os .Sh NAME @@ -39,6 +39,8 @@ .Nm .Op Fl dDfMRs .Op Fl c Ar configfile +.Op Fl F Ar dumpfile +.Op Fl p Ar pidfile .Ar interface ... .Sh DESCRIPTION .Nm @@ -126,6 +128,13 @@ Even more debugging information is print .It Fl f Foreground mode (useful when debugging). Log messages will be dumped to stderr when this option is specified. +.It Fl F +Specify an alternative file in which to dump internal states when +.Nm +receives signal +.Dv SIGUSR1 . +The default is +.Pa /var/run/rtadvd.dump . .It Fl M Specify an interface to join the all-routers site-local multicast group. By default, @@ -135,6 +144,10 @@ line. This option has meaning only with the .Fl R option, which enables routing renumbering protocol support. +.It Fl p +Specify an alternative file in which to store the process ID. +The default is +.Pa /var/run/rtadvd.pid. .It Fl R Accept router renumbering requests. If you enable it, certain IPsec setup is suggested for security reasons. @@ -150,7 +163,9 @@ Upon receipt of signal .Dv SIGUSR1 , .Nm will dump the current internal state into -.Pa /var/run/rtadvd.dump . +.Pa /var/run/rtadvd.dump +or the file specified with option +.Fl F . .Pp Use .Dv SIGTERM @@ -169,10 +184,9 @@ to all the interfaces .It Pa /etc/rtadvd.conf The default configuration file. .It Pa /var/run/rtadvd.pid -contains the pid of the currently running -.Nm . +The default process ID file. .It Pa /var/run/rtadvd.dump -The file in which +The default file in which .Nm dumps its internal state. .El Modified: stable/7/usr.sbin/rtadvd/rtadvd.c ============================================================================== --- stable/7/usr.sbin/rtadvd/rtadvd.c Tue Feb 8 11:48:37 2011 (r218433) +++ stable/7/usr.sbin/rtadvd/rtadvd.c Tue Feb 8 11:48:47 2011 (r218434) @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -79,8 +80,9 @@ struct iovec sndiov[2]; struct sockaddr_in6 rcvfrom; struct sockaddr_in6 sin6_allnodes = {sizeof(sin6_allnodes), AF_INET6}; struct in6_addr in6a_site_allrouters; -static char *dumpfilename = "/var/run/rtadvd.dump"; /* XXX: should be configurable */ -static char *pidfilename = "/var/run/rtadvd.pid"; /* should be configurable */ +static char *dumpfilename = "/var/run/rtadvd.dump"; +static char *pidfilename = "/var/run/rtadvd.pid"; +static struct pidfh *pfh; static char *mcastif; int sock; int rtsock = -1; @@ -159,11 +161,10 @@ main(argc, argv) struct timeval *timeout; int i, ch; int fflag = 0, logopt; - FILE *pidfp; - pid_t pid; + pid_t pid, otherpid; /* get command line options and arguments */ - while ((ch = getopt(argc, argv, "c:dDfM:Rs")) != -1) { + while ((ch = getopt(argc, argv, "c:dDF:fMp:Rs")) != -1) { switch (ch) { case 'c': conffile = optarg; @@ -189,6 +190,12 @@ main(argc, argv) case 's': sflag = 1; break; + case 'p': + pidfilename = optarg; + break; + case 'F': + dumpfilename = optarg; + break; } } argc -= optind; @@ -196,7 +203,7 @@ main(argc, argv) if (argc == 0) { fprintf(stderr, "usage: rtadvd [-dDfMRs] [-c conffile] " - "interfaces...\n"); + "[-F dumpfile] [-p pidfile] interfaces...\n"); exit(1); } @@ -234,6 +241,16 @@ main(argc, argv) exit(1); } + pfh = pidfile_open(pidfilename, 0600, &otherpid); + if (pfh == NULL) { + if (errno == EEXIST) + errx(1, "%s already running, pid: %d", + getprogname(), otherpid); + syslog(LOG_ERR, + "<%s> failed to open the pid log file, run anyway.", + __func__); + } + if (!fflag) daemon(1, 0); @@ -241,14 +258,7 @@ main(argc, argv) /* record the current PID */ pid = getpid(); - if ((pidfp = fopen(pidfilename, "w")) == NULL) { - syslog(LOG_ERR, - "<%s> failed to open the pid log file, run anyway.", - __func__); - } else { - fprintf(pidfp, "%d\n", pid); - fclose(pidfp); - } + pidfile_write(pfh); #ifdef HAVE_POLL_H set[0].fd = sock; @@ -383,6 +393,7 @@ die() ra_output(ra); sleep(MIN_DELAY_BETWEEN_RAS); } + pidfile_remove(pfh); exit(0); /*NOTREACHED*/ } From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 8 21:05:08 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 384591065693; Tue, 8 Feb 2011 21:05:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 25E3A8FC20; Tue, 8 Feb 2011 21:05:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p18L57JS059800; Tue, 8 Feb 2011 21:05:07 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18L579d059798; Tue, 8 Feb 2011 21:05:07 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102082105.p18L579d059798@svn.freebsd.org> From: John Baldwin Date: Tue, 8 Feb 2011 21:05:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218456 - stable/7/sys/nfsserver X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 21:05:08 -0000 Author: jhb Date: Tue Feb 8 21:05:07 2011 New Revision: 218456 URL: http://svn.freebsd.org/changeset/base/218456 Log: Properly close a socket for a TCP NFS client if the NFS server notices that the client has disconnected while attempting to fetch a request. This accidentally works most of the time because the socket upcall is invoked twice for some reason causing two nfsd threads to be assigned to the same connection. The first thread notices the disconnect when soreceive() fails, and the second thread will then cleanup the connection. Occasionally the second thread will grab the NFSD lock before the first thread has returned from soreceive() to mark the connection as disconnected. When that happens, the socket is never cleaned up and is leaked. Fix this by checking for the disconnect flag if there is an error pulling a request from the connection and closing the socket if it nfsrv_rcv() marked the connection as disconnected. Now the first thread will close the socket in most cases and the socket is never leaked. This is a direct commit to 7 as it is specific to the pre-krpc code used in 7. Modified: stable/7/sys/nfsserver/nfs_syscalls.c Modified: stable/7/sys/nfsserver/nfs_syscalls.c ============================================================================== --- stable/7/sys/nfsserver/nfs_syscalls.c Tue Feb 8 20:39:03 2011 (r218455) +++ stable/7/sys/nfsserver/nfs_syscalls.c Tue Feb 8 21:05:07 2011 (r218456) @@ -366,6 +366,8 @@ nfssvc_nfsd(struct thread *td) slp = nfsd->nfsd_slp; } if (error || (slp->ns_flag & SLP_VALID) == 0) { + if (slp->ns_flag & SLP_DISCONN) + nfsrv_zapsock(slp); if (nd) { if (nd->nd_cr != NULL) crfree(nd->nd_cr); From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 8 22:14:19 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D330106564A; Tue, 8 Feb 2011 22:14:19 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7984B8FC08; Tue, 8 Feb 2011 22:14:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p18MEJDk061565; Tue, 8 Feb 2011 22:14:19 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18MEJnv061557; Tue, 8 Feb 2011 22:14:19 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102082214.p18MEJnv061557@svn.freebsd.org> From: Marius Strobl Date: Tue, 8 Feb 2011 22:14:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218460 - in stable/7/sys: sparc64/include sparc64/pci sparc64/sbus sparc64/sparc64 sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 22:14:19 -0000 Author: marius Date: Tue Feb 8 22:14:19 2011 New Revision: 218460 URL: http://svn.freebsd.org/changeset/base/218460 Log: MFC: r216961 Reserve INTR_MD[1-4] similarly to what BUS_DMA_BUS[1-4] are intended for and switch sparc64 to use the first one for bus error filter handlers of bridge drivers instead of (ab)using INTR_FAST for that so we eventually can get rid of the latter. Reviewed by: jhb Modified: stable/7/sys/sparc64/include/intr_machdep.h stable/7/sys/sparc64/pci/fire.c stable/7/sys/sparc64/pci/psycho.c stable/7/sys/sparc64/pci/schizo.c stable/7/sys/sparc64/sbus/sbus.c stable/7/sys/sparc64/sparc64/intr_machdep.c stable/7/sys/sys/bus.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/include/intr_machdep.h ============================================================================== --- stable/7/sys/sparc64/include/intr_machdep.h Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/include/intr_machdep.h Tue Feb 8 22:14:19 2011 (r218460) @@ -47,11 +47,13 @@ #define PIL_STOP 5 /* stop cpu ipi */ #define PIL_PREEMPT 6 /* preempt idle thread cpu ipi */ #define PIL_FILTER 12 /* filter interrupts */ -#define PIL_FAST 13 /* fast interrupts */ +#define PIL_BRIDGE 13 /* bridge interrupts */ #define PIL_TICK 14 /* tick interrupts */ #ifndef LOCORE +#define INTR_BRIDGE INTR_MD1 + struct trapframe; typedef void ih_func_t(struct trapframe *); Modified: stable/7/sys/sparc64/pci/fire.c ============================================================================== --- stable/7/sys/sparc64/pci/fire.c Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/pci/fire.c Tue Feb 8 22:14:19 2011 (r218460) @@ -835,7 +835,7 @@ fire_set_intr(struct fire_softc *sc, u_i INTIGN(vec) != sc->sc_ign || intr_vectors[vec].iv_ic != &fire_ic || bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], - INTR_TYPE_MISC | INTR_FAST, handler, NULL, arg, + INTR_TYPE_MISC | INTR_BRIDGE, handler, NULL, arg, &sc->sc_ihand[index]) != 0) panic("%s: failed to set up interrupt %d", __func__, index); } Modified: stable/7/sys/sparc64/pci/psycho.c ============================================================================== --- stable/7/sys/sparc64/pci/psycho.c Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/pci/psycho.c Tue Feb 8 22:14:19 2011 (r218460) @@ -716,7 +716,7 @@ psycho_set_intr(struct psycho_softc *sc, INTVEC(PSYCHO_READ8(sc, intrmap)) != vec || intr_vectors[vec].iv_ic != &psycho_ic || bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], - INTR_TYPE_MISC | INTR_FAST, filt, intr, sc, + INTR_TYPE_MISC | INTR_BRIDGE, filt, intr, sc, &sc->sc_ihand[index]) != 0) panic("%s: failed to set up interrupt %d", __func__, index); } Modified: stable/7/sys/sparc64/pci/schizo.c ============================================================================== --- stable/7/sys/sparc64/pci/schizo.c Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/pci/schizo.c Tue Feb 8 22:14:19 2011 (r218460) @@ -745,7 +745,7 @@ schizo_set_intr(struct schizo_softc *sc, INTIGN(vec) != sc->sc_ign || intr_vectors[vec].iv_ic != &schizo_ic || bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], - INTR_TYPE_MISC | INTR_FAST, handler, NULL, sc, + INTR_TYPE_MISC | INTR_BRIDGE, handler, NULL, sc, &sc->sc_ihand[index]) != 0) panic("%s: failed to set up interrupt %d", __func__, index); } Modified: stable/7/sys/sparc64/sbus/sbus.c ============================================================================== --- stable/7/sys/sparc64/sbus/sbus.c Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/sbus/sbus.c Tue Feb 8 22:14:19 2011 (r218460) @@ -457,7 +457,7 @@ sbus_attach(device_t dev) INTIGN(vec = rman_get_start(sc->sc_ot_ires)) != sc->sc_ign || INTVEC(SYSIO_READ8(sc, SBR_THERM_INT_MAP)) != vec || intr_vectors[vec].iv_ic != &sbus_ic || - bus_setup_intr(dev, sc->sc_ot_ires, INTR_TYPE_MISC | INTR_FAST, + bus_setup_intr(dev, sc->sc_ot_ires, INTR_TYPE_MISC | INTR_BRIDGE, NULL, sbus_overtemp, sc, &sc->sc_ot_ihand) != 0) panic("%s: failed to set up temperature interrupt", __func__); i = 3; @@ -467,7 +467,7 @@ sbus_attach(device_t dev) INTIGN(vec = rman_get_start(sc->sc_pf_ires)) != sc->sc_ign || INTVEC(SYSIO_READ8(sc, SBR_POWER_INT_MAP)) != vec || intr_vectors[vec].iv_ic != &sbus_ic || - bus_setup_intr(dev, sc->sc_pf_ires, INTR_TYPE_MISC | INTR_FAST, + bus_setup_intr(dev, sc->sc_pf_ires, INTR_TYPE_MISC | INTR_BRIDGE, NULL, sbus_pwrfail, sc, &sc->sc_pf_ihand) != 0) panic("%s: failed to set up power fail interrupt", __func__); Modified: stable/7/sys/sparc64/sparc64/intr_machdep.c ============================================================================== --- stable/7/sys/sparc64/sparc64/intr_machdep.c Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sparc64/sparc64/intr_machdep.c Tue Feb 8 22:14:19 2011 (r218460) @@ -99,7 +99,7 @@ static const char *const pil_names[] = { "preempt", /* PIL_PREEMPT */ "stray", "stray", "stray", "stray", "stray", "filter", /* PIL_FILTER */ - "fast", /* PIL_FAST */ + "bridge", /* PIL_BRIDGE */ "tick", /* PIL_TICK */ }; @@ -328,10 +328,10 @@ inthand_add(const char *name, int vec, d if (vec < 0 || vec >= IV_MAX) return (EINVAL); /* - * INTR_FAST filters/handlers are special purpose only, allowing + * INTR_BRIDGE filters/handlers are special purpose only, allowing * them to be shared just would complicate things unnecessarily. */ - if ((flags & INTR_FAST) != 0 && (flags & INTR_EXCL) == 0) + if ((flags & INTR_BRIDGE) != 0 && (flags & INTR_EXCL) == 0) return (EINVAL); sx_xlock(&intr_table_lock); iv = &intr_vectors[vec]; @@ -349,7 +349,7 @@ inthand_add(const char *name, int vec, d ic->ic_disable(iv); iv->iv_refcnt++; if (iv->iv_refcnt == 1) - intr_setup((flags & INTR_FAST) != 0 ? PIL_FAST : + intr_setup((flags & INTR_BRIDGE) != 0 ? PIL_BRIDGE : filt != NULL ? PIL_FILTER : PIL_ITHREAD, intr_fast, vec, intr_execute_handlers, iv); else if (filt != NULL) { Modified: stable/7/sys/sys/bus.h ============================================================================== --- stable/7/sys/sys/bus.h Tue Feb 8 22:09:00 2011 (r218459) +++ stable/7/sys/sys/bus.h Tue Feb 8 22:14:19 2011 (r218460) @@ -190,7 +190,11 @@ enum intr_type { INTR_FAST = 128, INTR_EXCL = 256, /* exclusive interrupt */ INTR_MPSAFE = 512, /* this interrupt is SMP safe */ - INTR_ENTROPY = 1024 /* this interrupt provides entropy */ + INTR_ENTROPY = 1024, /* this interrupt provides entropy */ + INTR_MD1 = 4096, /* flag reserved for MD use */ + INTR_MD2 = 8192, /* flag reserved for MD use */ + INTR_MD3 = 16384, /* flag reserved for MD use */ + INTR_MD4 = 32768 /* flag reserved for MD use */ }; enum intr_trigger { From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 9 15:40:48 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD505106564A; Wed, 9 Feb 2011 15:40:48 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ABCC68FC16; Wed, 9 Feb 2011 15:40:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p19FemDw088979; Wed, 9 Feb 2011 15:40:48 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p19FemD2088977; Wed, 9 Feb 2011 15:40:48 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102091540.p19FemD2088977@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 9 Feb 2011 15:40:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218487 - stable/7/sys/conf X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2011 15:40:48 -0000 Author: pluknet Date: Wed Feb 9 15:40:48 2011 New Revision: 218487 URL: http://svn.freebsd.org/changeset/base/218487 Log: MFC r218189: Remove OpenSolaris include path referring to a non-existing directory. Reported by: arundel on freebsd-hackers@ via clang Approved by: kib (mentor) Modified: stable/7/sys/conf/kern.pre.mk Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/conf/kern.pre.mk ============================================================================== --- stable/7/sys/conf/kern.pre.mk Wed Feb 9 15:40:13 2011 (r218486) +++ stable/7/sys/conf/kern.pre.mk Wed Feb 9 15:40:48 2011 (r218487) @@ -77,9 +77,6 @@ INCLUDES+= -I$S/dev/twa # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs -# ... and OpenSolaris -INCLUDES+= -I$S/contrib/opensolaris/compat - # ... and the same for cxgb INCLUDES+= -I$S/dev/cxgb From owner-svn-src-stable-7@FreeBSD.ORG Thu Feb 10 00:20:57 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34245106564A; Thu, 10 Feb 2011 00:20:57 +0000 (UTC) (envelope-from mlaier@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 212B78FC08; Thu, 10 Feb 2011 00:20:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1A0KvRI002876; Thu, 10 Feb 2011 00:20:57 GMT (envelope-from mlaier@svn.freebsd.org) Received: (from mlaier@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1A0KvmS002874; Thu, 10 Feb 2011 00:20:57 GMT (envelope-from mlaier@svn.freebsd.org) Message-Id: <201102100020.p1A0KvmS002874@svn.freebsd.org> From: Max Laier Date: Thu, 10 Feb 2011 00:20:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218502 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2011 00:20:57 -0000 Author: mlaier Date: Thu Feb 10 00:20:56 2011 New Revision: 218502 URL: http://svn.freebsd.org/changeset/base/218502 Log: MFH: r180238 Use bcopy instead of strlcpy in uipc_bind and unp_connect, since soun->sun_path isn't a null-terminated string. As UNIX(4) states, "the terminating NUL is not part of the address." Since strlcpy has to return "the total length of the string [it] tried to create," it walks off the end of soun->sun_path looking for a \0. This reverts r105332. Modified: stable/7/sys/kern/uipc_usrreq.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/uipc_usrreq.c ============================================================================== --- stable/7/sys/kern/uipc_usrreq.c Thu Feb 10 00:05:11 2011 (r218501) +++ stable/7/sys/kern/uipc_usrreq.c Thu Feb 10 00:20:56 2011 (r218502) @@ -421,7 +421,8 @@ uipc_bind(struct socket *so, struct sock UNP_PCB_UNLOCK(unp); buf = malloc(namelen + 1, M_TEMP, M_WAITOK); - strlcpy(buf, soun->sun_path, namelen + 1); + bcopy(soun->sun_path, buf, namelen); + buf[namelen] = 0; restart: vfslocked = 0; @@ -1144,7 +1145,8 @@ unp_connect(struct socket *so, struct so len = nam->sa_len - offsetof(struct sockaddr_un, sun_path); if (len <= 0) return (EINVAL); - strlcpy(buf, soun->sun_path, len + 1); + bcopy(soun->sun_path, buf, len); + buf[len] = 0; UNP_PCB_LOCK(unp); if (unp->unp_flags & UNP_CONNECTING) { From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 05:54:46 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F12F01065672; Fri, 11 Feb 2011 05:54:46 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DEFCB8FC0A; Fri, 11 Feb 2011 05:54:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1B5skPx047423; Fri, 11 Feb 2011 05:54:46 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5skjI047421; Fri, 11 Feb 2011 05:54:46 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102110554.p1B5skjI047421@svn.freebsd.org> From: Doug Barton Date: Fri, 11 Feb 2011 05:54:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218540 - stable/7/etc/rc.d X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:54:47 -0000 Author: dougb Date: Fri Feb 11 05:54:46 2011 New Revision: 218540 URL: http://svn.freebsd.org/changeset/base/218540 Log: MFC 218142: Let rpcbind clean up after itself Modified: stable/7/etc/rc.d/rpcbind Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.d/rpcbind ============================================================================== --- stable/7/etc/rc.d/rpcbind Fri Feb 11 05:53:46 2011 (r218539) +++ stable/7/etc/rc.d/rpcbind Fri Feb 11 05:54:46 2011 (r218540) @@ -13,5 +13,7 @@ name="rpcbind" rcvar=`set_rcvar` command="/usr/sbin/${name}" +stop_postcmd='/bin/rm -f /var/run/rpcbind.*' + load_rc_config $name run_rc_command "$1" From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 05:57:33 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F511065695; Fri, 11 Feb 2011 05:57:33 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B38658FC08; Fri, 11 Feb 2011 05:57:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1B5vXTj047644; Fri, 11 Feb 2011 05:57:33 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5vX54047642; Fri, 11 Feb 2011 05:57:33 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102110557.p1B5vX54047642@svn.freebsd.org> From: Doug Barton Date: Fri, 11 Feb 2011 05:57:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218543 - stable/7/etc/namedb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:57:34 -0000 Author: dougb Date: Fri Feb 11 05:57:33 2011 New Revision: 218543 URL: http://svn.freebsd.org/changeset/base/218543 Log: MFC 218350: Catch up with reality and references from the latest RFCs (especially 5735) for our default empty zones. Modified: stable/7/etc/namedb/named.conf Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/namedb/named.conf ============================================================================== --- stable/7/etc/namedb/named.conf Fri Feb 11 05:56:48 2011 (r218542) +++ stable/7/etc/namedb/named.conf Fri Feb 11 05:57:33 2011 (r218543) @@ -125,7 +125,7 @@ zone "in-addr.arpa" { 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots */ -// RFC 1912 (and BCP 32 for localhost) +// RFCs 1912 and 5735 (and BCP 32 for localhost) zone "localhost" { type master; file "/etc/namedb/master/localhost-forward.db"; }; zone "127.in-addr.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; }; zone "255.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; @@ -133,10 +133,10 @@ zone "255.in-addr.arpa" { type master; f // RFC 1912-style zone for IPv6 localhost address zone "0.ip6.arpa" { type master; file "/etc/namedb/master/localhost-reverse.db"; }; -// "This" Network (RFCs 1912 and 3330) +// "This" Network (RFCs 1912 and 5735) zone "0.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// Private Use Networks (RFC 1918) +// Private Use Networks (RFCs 1918 and 5735) zone "10.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; @@ -156,16 +156,19 @@ zone "30.172.in-addr.arpa" { type master zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// Link-local/APIPA (RFCs 3330 and 3927) +// Link-local/APIPA (RFCs 3927 and 5735) zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// TEST-NET-[1-3] for Documentation (RFC 5737) +// IETF protocol assignments (RFCs 5735 and 5736) +zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; + +// TEST-NET-[1-3] for Documentation (RFCs 5735 and 5737) zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; // IPv6 Range for Documentation (RFC 3849) -zone "0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; }; +zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) zone "test" { type master; file "/etc/namedb/master/empty.db"; }; @@ -175,11 +178,11 @@ zone "example.com" { type master; file " zone "example.net" { type master; file "/etc/namedb/master/empty.db"; }; zone "example.org" { type master; file "/etc/namedb/master/empty.db"; }; -// Router Benchmark Testing (RFC 3330) +// Router Benchmark Testing (RFCs 2544 and 5735) zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; -// IANA Reserved - Old Class E Space +// IANA Reserved - Old Class E Space (RFC 5735) zone "240.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "241.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; zone "242.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }; From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 10:06:49 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94B45106564A; Fri, 11 Feb 2011 10:06:49 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 833CA8FC1B; Fri, 11 Feb 2011 10:06:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BA6ngk053748; Fri, 11 Feb 2011 10:06:49 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BA6n2A053745; Fri, 11 Feb 2011 10:06:49 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102111006.p1BA6n2A053745@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 11 Feb 2011 10:06:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218549 - stable/7/etc X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 10:06:49 -0000 Author: jh Date: Fri Feb 11 10:06:49 2011 New Revision: 218549 URL: http://svn.freebsd.org/changeset/base/218549 Log: MFC r217090: Warn if rules could not be read from a ruleset file. Now at least something gets logged if the file has syntax errors. PR: conf/91342 Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Fri Feb 11 09:58:38 2011 (r218548) +++ stable/7/etc/rc.subr Fri Feb 11 10:06:49 2011 (r218549) @@ -1242,7 +1242,10 @@ devfs_init_rulesets() return fi for file in $devfs_rulesets; do - devfs_rulesets_from_file $file || return 1 + if ! devfs_rulesets_from_file $file; then + warn "$_me: could not read rules from $file" + return 1 + fi done devfs_rulesets_init=1 debug "$_me: devfs rulesets initialized" From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 13:53:39 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D80F01065672; Fri, 11 Feb 2011 13:53:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C71C28FC18; Fri, 11 Feb 2011 13:53:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BDrdvR061909; Fri, 11 Feb 2011 13:53:39 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDrd8e061907; Fri, 11 Feb 2011 13:53:39 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111353.p1BDrd8e061907@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:53:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218561 - stable/7/usr.bin/gzip X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:53:40 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:53:39 2011 New Revision: 218561 URL: http://svn.freebsd.org/changeset/base/218561 Log: MFC 218421: Remove CRT reference from zmore(1). PR: 154441 Approved by: keramida (mentor) Modified: stable/7/usr.bin/gzip/zmore.1 Directory Properties: stable/7/usr.bin/gzip/ (props changed) Modified: stable/7/usr.bin/gzip/zmore.1 ============================================================================== --- stable/7/usr.bin/gzip/zmore.1 Fri Feb 11 13:52:55 2011 (r218560) +++ stable/7/usr.bin/gzip/zmore.1 Fri Feb 11 13:53:39 2011 (r218561) @@ -20,12 +20,12 @@ .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" .\" $FreeBSD$ -.Dd January 26, 2007 +.Dd February 06, 2011 .Dt ZMORE 1 .Os .Sh NAME .Nm zmore -.Nd view compressed files on a CRT +.Nd view compressed files .Sh SYNOPSIS .Nm zmore .Op Ar flags From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 13:56:06 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4D041065675; Fri, 11 Feb 2011 13:56:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A3E598FC0A; Fri, 11 Feb 2011 13:56:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BDu6o6062075; Fri, 11 Feb 2011 13:56:06 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDu6qG062073; Fri, 11 Feb 2011 13:56:06 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111356.p1BDu6qG062073@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:56:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218563 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:56:06 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:56:06 2011 New Revision: 218563 URL: http://svn.freebsd.org/changeset/base/218563 Log: MFC 218398: Fix typo in amdtemp(4). Approved by: keramida (mentor) Modified: stable/7/share/man/man4/amdtemp.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/amdtemp.4 ============================================================================== --- stable/7/share/man/man4/amdtemp.4 Fri Feb 11 13:55:27 2011 (r218562) +++ stable/7/share/man/man4/amdtemp.4 Fri Feb 11 13:56:06 2011 (r218563) @@ -53,7 +53,7 @@ in AMD K8, K10 and K11 processors. .Pp For the K8 family, the .Nm -driver reports each cores' temperature through a sysctl node in the +driver reports each core's temperature through a sysctl node in the corresponding CPU devices's sysctl tree, named .Va dev.amdtemp.%d.sensor{0,1}.core{0,1} . The driver also creates From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 13:59:56 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C398106566B; Fri, 11 Feb 2011 13:59:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B2348FC13; Fri, 11 Feb 2011 13:59:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BDxu0D062252; Fri, 11 Feb 2011 13:59:56 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDxusT062250; Fri, 11 Feb 2011 13:59:56 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111359.p1BDxusT062250@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:59:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218565 - stable/7/share/man/man9 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:59:56 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:59:56 2011 New Revision: 218565 URL: http://svn.freebsd.org/changeset/base/218565 Log: MFC 212440,212493,212500: Add RETURN VALUES section to devclass_get_maxunit(9). PR: 149979 Approved by: keramida (mentor) Modified: stable/7/share/man/man9/devclass_get_maxunit.9 Directory Properties: stable/7/share/man/man9/ (props changed) Modified: stable/7/share/man/man9/devclass_get_maxunit.9 ============================================================================== --- stable/7/share/man/man9/devclass_get_maxunit.9 Fri Feb 11 13:58:30 2011 (r218564) +++ stable/7/share/man/man9/devclass_get_maxunit.9 Fri Feb 11 13:59:56 2011 (r218565) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 3, 2005 +.Dd September 10, 2010 .Dt DEVCLASS_GET_MAXUNIT 9 .Os .Sh NAME @@ -43,6 +43,19 @@ Returns the next unit number to be allocated to device instances in the .Dv devclass . This is one greater than the highest currently allocated unit. +.Sh RETURN VALUES +The +.Fn devclass_get_maxunit +function returns -1 if +.Fa dc +is +.Dv NULL; +otherwise it returns the next unit +number in +.Fa dc's +devclass. +.Sh ERRORS +None. .Sh SEE ALSO .Xr devclass 9 , .Xr device 9 From owner-svn-src-stable-7@FreeBSD.ORG Fri Feb 11 15:13:04 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E17E106567A; Fri, 11 Feb 2011 15:13:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C56F8FC13; Fri, 11 Feb 2011 15:13:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1BFD4QV064622; Fri, 11 Feb 2011 15:13:04 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BFD4gt064620; Fri, 11 Feb 2011 15:13:04 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102111513.p1BFD4gt064620@svn.freebsd.org> From: John Baldwin Date: Fri, 11 Feb 2011 15:13:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218574 - stable/7/sys/netinet X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 15:13:04 -0000 Author: jhb Date: Fri Feb 11 15:13:03 2011 New Revision: 218574 URL: http://svn.freebsd.org/changeset/base/218574 Log: MFC 218271: When turning off TCP_NOPUSH, only call tcp_output() to immediately flush any pending data if the connection is established. Modified: stable/7/sys/netinet/tcp_usrreq.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netinet/tcp_usrreq.c ============================================================================== --- stable/7/sys/netinet/tcp_usrreq.c Fri Feb 11 15:12:31 2011 (r218573) +++ stable/7/sys/netinet/tcp_usrreq.c Fri Feb 11 15:13:03 2011 (r218574) @@ -1318,9 +1318,10 @@ tcp_ctloutput(struct socket *so, struct INP_WLOCK_RECHECK(inp); if (optval) tp->t_flags |= TF_NOPUSH; - else { + else if (tp->t_flags & TF_NOPUSH) { tp->t_flags &= ~TF_NOPUSH; - error = tcp_output(tp); + if (TCPS_HAVEESTABLISHED(tp->t_state)) + error = tcp_output(tp); } INP_WUNLOCK(inp); break; From owner-svn-src-stable-7@FreeBSD.ORG Sat Feb 12 13:41:05 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A56721065762; Sat, 12 Feb 2011 13:41:05 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E2CAA8FC17; Sat, 12 Feb 2011 13:41:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1CDf2AN003372; Sat, 12 Feb 2011 13:41:02 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1CDf2PC003369; Sat, 12 Feb 2011 13:41:02 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102121341.p1CDf2PC003369@svn.freebsd.org> From: Marius Strobl Date: Sat, 12 Feb 2011 13:41:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218607 - stable/7/sys/dev/sound/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2011 13:41:05 -0000 Author: marius Date: Sat Feb 12 13:41:02 2011 New Revision: 218607 URL: http://svn.freebsd.org/changeset/base/218607 Log: MFC: r218478 Correct signedness and off-by-one issues in parameters used for DMA tag creation. PR: 154259 Submitted by: Vladislav Movchan (partially) Modified: stable/7/sys/dev/sound/pci/emu10k1.c stable/7/sys/dev/sound/pci/emu10kx.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sound/pci/emu10k1.c ============================================================================== --- stable/7/sys/dev/sound/pci/emu10k1.c Sat Feb 12 13:41:00 2011 (r218606) +++ stable/7/sys/dev/sound/pci/emu10k1.c Sat Feb 12 13:41:02 2011 (r218607) @@ -2012,7 +2012,7 @@ emu_pci_attach(device_t dev) if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, - /*lowaddr*/1 << 31, /* can only access 0-2gb */ + /*lowaddr*/(1U << 31) - 1, /* can only access 0-2gb */ /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/sc->bufsz, /*nsegments*/1, /*maxsegz*/0x3ffff, Modified: stable/7/sys/dev/sound/pci/emu10kx.c ============================================================================== --- stable/7/sys/dev/sound/pci/emu10kx.c Sat Feb 12 13:41:00 2011 (r218606) +++ stable/7/sys/dev/sound/pci/emu10kx.c Sat Feb 12 13:41:02 2011 (r218607) @@ -2696,7 +2696,7 @@ emu_init(struct emu_sc_info *sc) if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(sc->dev), /* alignment */ 2, /* boundary */ 0, - /* lowaddr */ 1 << 31, /* can only access 0-2gb */ + /* lowaddr */ (1U << 31) - 1, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, /* filter */ NULL, /* filterarg */ NULL, /* maxsize */ EMU_MAX_BUFSZ, /* nsegments */ 1, /* maxsegz */ 0x3ffff, From owner-svn-src-stable-7@FreeBSD.ORG Sat Feb 12 17:58:37 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F265106566C; Sat, 12 Feb 2011 17:58:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D8CFD8FC1C; Sat, 12 Feb 2011 17:58:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1CHwaXk009924; Sat, 12 Feb 2011 17:58:36 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1CHwaHc009921; Sat, 12 Feb 2011 17:58:36 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102121758.p1CHwaHc009921@svn.freebsd.org> From: Glen Barber Date: Sat, 12 Feb 2011 17:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218615 - stable/7/share/man/man5 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2011 17:58:37 -0000 Author: gjb (doc committer) Date: Sat Feb 12 17:58:36 2011 New Revision: 218615 URL: http://svn.freebsd.org/changeset/base/218615 Log: MFC 212827, 217717: Note that devfs(5) and fdescfs(5) both create /dev/fd file descriptors. PR: 144534 Approved by: keramida (mentor) Modified: stable/7/share/man/man5/devfs.5 stable/7/share/man/man5/fdescfs.5 Directory Properties: stable/7/share/man/man5/ (props changed) Modified: stable/7/share/man/man5/devfs.5 ============================================================================== --- stable/7/share/man/man5/devfs.5 Sat Feb 12 17:57:56 2011 (r218614) +++ stable/7/share/man/man5/devfs.5 Sat Feb 12 17:58:36 2011 (r218615) @@ -38,7 +38,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 30, 2010 +.Dd September 18, 2010 .Dt DEVFS 5 .Os .Sh NAME @@ -69,6 +69,27 @@ The .Xr mknod 8 tool can be used to recover deleted device entries under .Nm . +.Pp +The +.Xr fdescfs 5 +filesystem is an alternate means for populating +.Pa /dev/fd . +The character devices that both +.Nm +and +.Xr fdescfs 5 +present in +.Pa /dev/fd +correspond to the open file descriptors of the process +accessing the directory. +.Nm +only creates files for the standard file descriptors +.Pa 0 , +.Pa 1 +and +.Pa 2 . +.Xr fdescfs 5 +creates files for all open descriptors. .Sh FILES .Bl -tag -width /dev/XXXX -compact .It Pa /dev @@ -84,6 +105,7 @@ volume located on .Pp .Dl "mount -t devfs devfs /mychroot/dev" .Sh SEE ALSO +.Xr fdescfs 5 , .Xr devfs 8 , .Xr mount 8 .Sh HISTORY Modified: stable/7/share/man/man5/fdescfs.5 ============================================================================== --- stable/7/share/man/man5/fdescfs.5 Sat Feb 12 17:57:56 2011 (r218614) +++ stable/7/share/man/man5/fdescfs.5 Sat Feb 12 17:58:36 2011 (r218615) @@ -38,7 +38,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 1996 +.Dd September 18, 2010 .Dt FDESCFS 5 .Os .Sh NAME @@ -87,6 +87,19 @@ call other than and .Dv O_RDWR are ignored. +.Pp +.Em "Note:" +.Pa /dev/fd/0 , +.Pa /dev/fd/1 +and +.Pa /dev/fd/2 +files are created by default when devfs alone is mounted. +.Nm +creates entries for all file descriptors opened by the process. +.Sh FILES +.Bl -tag -width /dev/stderr -compact +.It Pa /dev/fd/# +.El .Sh EXAMPLES To mount a .Nm @@ -94,11 +107,8 @@ volume located on .Pa /dev/fd : .Pp .Dl "mount -t fdescfs null /dev/fd" -.Sh FILES -.Bl -tag -width /dev/stderr -compact -.It Pa /dev/fd/# -.El .Sh SEE ALSO +.Xr devfs 5 , .Xr mount 8 .Sh HISTORY The