From owner-svn-src-stable@FreeBSD.ORG Sun Feb 6 01:00:40 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Sun Feb 6 01:13:10 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B014106566B; Sun, 6 Feb 2011 01:13:10 +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 683B28FC08; Sun, 6 Feb 2011 01:13:10 +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 p161DA2G047672; Sun, 6 Feb 2011 01:13:10 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p161DAoK047670; Sun, 6 Feb 2011 01:13:10 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201102060113.p161DAoK047670@svn.freebsd.org> From: Ed Maste Date: Sun, 6 Feb 2011 01:13:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218362 - stable/8/sys/dev/aac X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 01:13:10 -0000 Author: emaste Date: Sun Feb 6 01:13:10 2011 New Revision: 218362 URL: http://svn.freebsd.org/changeset/base/218362 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/8/sys/dev/aac/aac.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/aac/aac.c ============================================================================== --- stable/8/sys/dev/aac/aac.c Sun Feb 6 01:00:40 2011 (r218361) +++ stable/8/sys/dev/aac/aac.c Sun Feb 6 01:13:10 2011 (r218362) @@ -1415,11 +1415,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@FreeBSD.ORG Sun Feb 6 09:33:08 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1A401065694; Sun, 6 Feb 2011 09:33:08 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BEF108FC18; Sun, 6 Feb 2011 09:33:08 +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 p169X8Q5058842; Sun, 6 Feb 2011 09:33:08 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p169X8IZ058840; Sun, 6 Feb 2011 09:33:08 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102060933.p169X8IZ058840@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 6 Feb 2011 09:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218365 - stable/8/libexec/rtld-elf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 09:33:08 -0000 Author: kib Date: Sun Feb 6 09:33:08 2011 New Revision: 218365 URL: http://svn.freebsd.org/changeset/base/218365 Log: MFC r218098: Make ldd(1) work when versioned dependency file is cannot be loaded. MFC r218099: Fix grammar. Modified: stable/8/libexec/rtld-elf/rtld.c Directory Properties: stable/8/libexec/rtld-elf/ (props changed) Modified: stable/8/libexec/rtld-elf/rtld.c ============================================================================== --- stable/8/libexec/rtld-elf/rtld.c Sun Feb 6 08:46:37 2011 (r218364) +++ stable/8/libexec/rtld-elf/rtld.c Sun Feb 6 09:33:08 2011 (r218365) @@ -3448,10 +3448,17 @@ locate_dependency(const Obj_Entry *obj, } for (needed = obj->needed; needed != NULL; needed = needed->next) { - if (needed->obj == NULL) - continue; - if (object_match_name(needed->obj, name)) - return needed->obj; + if (strcmp(obj->strtab + needed->name, name) == 0 || + (needed->obj != NULL && object_match_name(needed->obj, name))) { + /* + * If there is DT_NEEDED for the name we are looking for, + * we are all set. Note that object might not be found if + * dependency was not loaded yet, so the function can + * return NULL here. This is expected and handled + * properly by the caller. + */ + return (needed->obj); + } } _rtld_error("%s: Unexpected inconsistency: dependency %s not found", obj->path, name); @@ -3577,6 +3584,8 @@ rtld_verify_object_versions(Obj_Entry *o vn = obj->verneed; while (vn != NULL) { depobj = locate_dependency(obj, obj->strtab + vn->vn_file); + if (depobj == NULL) + return (-1); vna = (const Elf_Vernaux *) ((char *)vn + vn->vn_aux); for (;;) { if (check_object_provided_version(obj, depobj, vna)) From owner-svn-src-stable@FreeBSD.ORG Sun Feb 6 13:59:04 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 466A4106564A; Sun, 6 Feb 2011 13:59:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 33E818FC08; Sun, 6 Feb 2011 13:59: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 p16Dx4ue067008; Sun, 6 Feb 2011 13:59:04 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16Dx4WU067003; Sun, 6 Feb 2011 13:59:04 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201102061359.p16Dx4WU067003@svn.freebsd.org> From: Brooks Davis Date: Sun, 6 Feb 2011 13:59:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218372 - in stable/8: etc/defaults etc/periodic/security share/man/man5 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 13:59:04 -0000 Author: brooks Date: Sun Feb 6 13:59:03 2011 New Revision: 218372 URL: http://svn.freebsd.org/changeset/base/218372 Log: MFC r215213: Add an (off by default) check for negative permissions (where the group on a object has less permissions than everyone). These permissions will not work reliably over NFS if you have more than 14 supplemental groups and are usually not what you mean. Added: stable/8/etc/periodic/security/110.neggrpperm - copied unchanged from r215213, head/etc/periodic/security/110.neggrpperm Modified: stable/8/etc/defaults/periodic.conf stable/8/etc/periodic/security/Makefile stable/8/share/man/man5/periodic.conf.5 Directory Properties: stable/8/etc/ (props changed) stable/8/share/man/man5/ (props changed) Modified: stable/8/etc/defaults/periodic.conf ============================================================================== --- stable/8/etc/defaults/periodic.conf Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/etc/defaults/periodic.conf Sun Feb 6 13:59:03 2011 (r218372) @@ -157,6 +157,9 @@ daily_status_security_diff_flags="-b -u" # 100.chksetuid daily_status_security_chksetuid_enable="YES" +# 110.neggrpperm +daily_status_security_neggrpperm_enable="NO" + # 200.chkmounts daily_status_security_chkmounts_enable="YES" #daily_status_security_chkmounts_ignore="^amd:" # Don't check matching Copied: stable/8/etc/periodic/security/110.neggrpperm (from r215213, head/etc/periodic/security/110.neggrpperm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/etc/periodic/security/110.neggrpperm Sun Feb 6 13:59:03 2011 (r218372, copy of r215213, head/etc/periodic/security/110.neggrpperm) @@ -0,0 +1,54 @@ +#!/bin/sh - +# +# Copyright (c) 2001 The FreeBSD Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +rc=0 + +case "$daily_status_security_neggrpperm_enable" in + [Yy][Ee][Ss]) + echo "" + echo 'Checking negative group permissions:' + MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'` + n=$(find -sx $MP /dev/null -type f \ + \( \( ! -perm +010 -and -perm +001 \) -or \ + \( ! -perm +020 -and -perm +002 \) -or \ + \( ! -perm +040 -and -perm +004 \) \) \ + -exec ls -liTd \{\} \+ | tee /dev/stderr | wc -l) + [ $n -gt 0 ] && rc=1 || rc=0 + ;; +esac + +exit $rc Modified: stable/8/etc/periodic/security/Makefile ============================================================================== --- stable/8/etc/periodic/security/Makefile Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/etc/periodic/security/Makefile Sun Feb 6 13:59:03 2011 (r218372) @@ -3,6 +3,7 @@ .include FILES= 100.chksetuid \ + 110.neggrpperm \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ Modified: stable/8/share/man/man5/periodic.conf.5 ============================================================================== --- stable/8/share/man/man5/periodic.conf.5 Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/share/man/man5/periodic.conf.5 Sun Feb 6 13:59:03 2011 (r218372) @@ -482,6 +482,14 @@ Set to .Dq Li YES to compare the modes and modification times of setuid executables with the previous day's values. +.It Va daily_status_security_neggrpperm_enable +.Pq Vt bool +Set to +.Dq Li YES +to check for files where the group of a file has less permissions than +the world at large. +When users are in more than 14 supplemental groups these negative +permissions may not be enforced via NFS shares. .It Va daily_status_security_chkmounts_enable .Pq Vt bool Set to From owner-svn-src-stable@FreeBSD.ORG Mon Feb 7 11:12:28 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 398B8106578D; Mon, 7 Feb 2011 11:12: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 279118FC19; Mon, 7 Feb 2011 11:12: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 p17BCSrc007486; Mon, 7 Feb 2011 11:12:28 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17BCS6u007484; Mon, 7 Feb 2011 11:12:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102071112.p17BCS6u007484@svn.freebsd.org> From: Glen Barber Date: Mon, 7 Feb 2011 11:12:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218395 - stable/8/share/man/man7 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 11:12:32 -0000 Author: gjb (doc committer) Date: Mon Feb 7 11:12:27 2011 New Revision: 218395 URL: http://svn.freebsd.org/changeset/base/218395 Log: MFC 214374: Minor grammar fixes. Approved by: keramida (mentor) Modified: stable/8/share/man/man7/build.7 Directory Properties: stable/8/share/man/man7/ (props changed) Modified: stable/8/share/man/man7/build.7 ============================================================================== --- stable/8/share/man/man7/build.7 Mon Feb 7 10:02:47 2011 (r218394) +++ stable/8/share/man/man7/build.7 Mon Feb 7 11:12:27 2011 (r218395) @@ -409,7 +409,7 @@ Typically, one only needs to set .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@FreeBSD.ORG Mon Feb 7 11:13:29 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Mon Feb 7 19:12:30 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0519106566B; Mon, 7 Feb 2011 19:12:30 +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 B00518FC18; Mon, 7 Feb 2011 19:12:30 +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 p17JCUMj019550; Mon, 7 Feb 2011 19:12:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17JCU3Q019548; Mon, 7 Feb 2011 19:12:30 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102071912.p17JCU3Q019548@svn.freebsd.org> From: Glen Barber Date: Mon, 7 Feb 2011 19:12:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218412 - stable/8/sbin/newfs X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 19:12:30 -0000 Author: gjb (doc committer) Date: Mon Feb 7 19:12:30 2011 New Revision: 218412 URL: http://svn.freebsd.org/changeset/base/218412 Log: MFC 212610: Synchronize newfs(8) manual with code. PR: 61716 Approved by: keramida (mentor) Modified: stable/8/sbin/newfs/newfs.8 Directory Properties: stable/8/sbin/newfs/ (props changed) Modified: stable/8/sbin/newfs/newfs.8 ============================================================================== --- stable/8/sbin/newfs/newfs.8 Mon Feb 7 18:10:18 2011 (r218411) +++ stable/8/sbin/newfs/newfs.8 Mon Feb 7 19:12:30 2011 (r218412) @@ -125,8 +125,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@FreeBSD.ORG Mon Feb 7 19:13:20 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Tue Feb 8 08:44:09 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BD6B1065673; Tue, 8 Feb 2011 08:44:09 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC9CD8FC14; Tue, 8 Feb 2011 08:44:08 +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 p188i8iJ039221; Tue, 8 Feb 2011 08:44:08 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p188i8Tr039219; Tue, 8 Feb 2011 08:44:08 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102080844.p188i8Tr039219@svn.freebsd.org> From: Martin Matuska Date: Tue, 8 Feb 2011 08:44:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218429 - stable/8/sys/cddl/compat/opensolaris/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 08:44:09 -0000 Author: mm Date: Tue Feb 8 08:44:08 2011 New Revision: 218429 URL: http://svn.freebsd.org/changeset/base/218429 Log: MFC r218180 (= fixed r218169): For the ZFS kernel module, change the type of clock_t to int64_t. The clock_t type in OpenSolaris is long (int64_t on amd64). On FreeBSD clock_t is int32_t. The clock_t type is used in several places in the ZFS code to store system uptime in milliseconds ("seconds * hz"). With hz=1000 we have a 32-bit integer overflow in 24 days, 20 hours, 31 minutes and 23.648 seconds. This has a user reported negative impact on l2arc_feed_thread() and may cause unexpected results from other functions using clock_t. Reported by: Artem Belevich on freebsd-fs@ Modified: stable/8/sys/cddl/compat/opensolaris/sys/types.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/cddl/compat/opensolaris/sys/types.h ============================================================================== --- stable/8/sys/cddl/compat/opensolaris/sys/types.h Tue Feb 8 04:48:53 2011 (r218428) +++ stable/8/sys/cddl/compat/opensolaris/sys/types.h Tue Feb 8 08:44:08 2011 (r218429) @@ -34,6 +34,12 @@ */ #include + +#ifdef _KERNEL +typedef int64_t clock_t; +#define _CLOCK_T_DECLARED +#endif + #include_next #define MAXNAMELEN 256 From owner-svn-src-stable@FreeBSD.ORG Tue Feb 8 09:25:33 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30A521065675; Tue, 8 Feb 2011 09:25:33 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 055F28FC28; Tue, 8 Feb 2011 09:25: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 p189PWSp040160; Tue, 8 Feb 2011 09:25:32 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p189PW2D040158; Tue, 8 Feb 2011 09:25:32 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102080925.p189PW2D040158@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 8 Feb 2011 09:25:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218430 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 09:25:33 -0000 Author: kib Date: Tue Feb 8 09:25:32 2011 New Revision: 218430 URL: http://svn.freebsd.org/changeset/base/218430 Log: MFC r218168: Only process as much array elements as we find the sockets during second phase of gc. Take linkage lock and recheck the eligibility of the socket for gc, as well as call fhold() under the linkage lock. Modified: stable/8/sys/kern/uipc_usrreq.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/kern/uipc_usrreq.c ============================================================================== --- stable/8/sys/kern/uipc_usrreq.c Tue Feb 8 08:44:08 2011 (r218429) +++ stable/8/sys/kern/uipc_usrreq.c Tue Feb 8 09:25:32 2011 (r218430) @@ -2045,9 +2045,9 @@ unp_gc(__unused void *arg, int pending) { struct unp_head *heads[] = { &unp_dhead, &unp_shead, NULL }; struct unp_head **head; - struct file **unref; + struct file *f, **unref; struct unpcb *unp; - int i; + int i, total; unp_taskcount++; UNP_LIST_LOCK(); @@ -2085,33 +2085,37 @@ unp_gc(__unused void *arg, int pending) * Iterate looking for sockets which have been specifically marked * as as unreachable and store them locally. */ + UNP_LINK_RLOCK(); UNP_LIST_LOCK(); - for (i = 0, head = heads; *head != NULL; head++) + for (total = 0, head = heads; *head != NULL; head++) LIST_FOREACH(unp, *head, unp_link) - if (unp->unp_gcflag & UNPGC_DEAD) { - unref[i++] = unp->unp_file; - fhold(unp->unp_file); - KASSERT(unp->unp_file != NULL, - ("unp_gc: Invalid unpcb.")); - KASSERT(i <= unp_unreachable, + if ((unp->unp_gcflag & UNPGC_DEAD) != 0) { + f = unp->unp_file; + if (unp->unp_msgcount == 0 || f == NULL || + f->f_count != unp->unp_msgcount) + continue; + unref[total++] = f; + fhold(f); + KASSERT(total <= unp_unreachable, ("unp_gc: incorrect unreachable count.")); } UNP_LIST_UNLOCK(); + UNP_LINK_RUNLOCK(); /* * Now flush all sockets, free'ing rights. This will free the * struct files associated with these sockets but leave each socket * with one remaining ref. */ - for (i = 0; i < unp_unreachable; i++) + for (i = 0; i < total; i++) sorflush(unref[i]->f_data); /* * And finally release the sockets so they can be reclaimed. */ - for (i = 0; i < unp_unreachable; i++) + for (i = 0; i < total; i++) fdrop(unref[i], NULL); - unp_recycled += unp_unreachable; + unp_recycled += total; free(unref, M_TEMP); } From owner-svn-src-stable@FreeBSD.ORG Tue Feb 8 09:28:29 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B85E106564A; Tue, 8 Feb 2011 09:28:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 18C978FC14; Tue, 8 Feb 2011 09:28:29 +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 p189SSKx040271; Tue, 8 Feb 2011 09:28:28 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p189SSOe040269; Tue, 8 Feb 2011 09:28:28 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102080928.p189SSOe040269@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 8 Feb 2011 09:28:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218431 - stable/8/sys/dev/md X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 09:28:29 -0000 Author: kib Date: Tue Feb 8 09:28:28 2011 New Revision: 218431 URL: http://svn.freebsd.org/changeset/base/218431 Log: MFC r217946: Add support for BIO_DELETE on swap-backed md(4). Modified: stable/8/sys/dev/md/md.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/md/md.c ============================================================================== --- stable/8/sys/dev/md/md.c Tue Feb 8 09:25:32 2011 (r218430) +++ stable/8/sys/dev/md/md.c Tue Feb 8 09:28:28 2011 (r218431) @@ -648,7 +648,6 @@ mdstart_swap(struct md_s *sc, struct bio } bcopy(p, (void *)(sf_buf_kva(sf) + offs), len); m->valid = VM_PAGE_BITS_ALL; -#if 0 } else if (bp->bio_cmd == BIO_DELETE) { if (len != PAGE_SIZE && m->valid != VM_PAGE_BITS_ALL) rv = vm_pager_get_pages(sc->object, &m, 1, 0); @@ -658,16 +657,21 @@ mdstart_swap(struct md_s *sc, struct bio vm_page_wakeup(m); break; } - bzero((void *)(sf_buf_kva(sf) + offs), len); - vm_page_dirty(m); - m->valid = VM_PAGE_BITS_ALL; -#endif + if (len != PAGE_SIZE) { + bzero((void *)(sf_buf_kva(sf) + offs), len); + vm_page_clear_dirty(m, offs, len); + m->valid = VM_PAGE_BITS_ALL; + } else + vm_pager_page_unswapped(m); } sf_buf_free(sf); sched_unpin(); vm_page_wakeup(m); vm_page_lock_queues(); - vm_page_activate(m); + if (bp->bio_cmd == BIO_DELETE && len == PAGE_SIZE) + vm_page_free(m); + else + vm_page_activate(m); if (bp->bio_cmd == BIO_WRITE) vm_page_dirty(m); vm_page_unlock_queues(); From owner-svn-src-stable@FreeBSD.ORG Tue Feb 8 11:48:38 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CAFE106564A; Tue, 8 Feb 2011 11:48:38 +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 5D5EB8FC16; Tue, 8 Feb 2011 11:48:38 +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 p18BmcSq044706; Tue, 8 Feb 2011 11:48:38 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18Bmc9a044702; Tue, 8 Feb 2011 11:48:38 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201102081148.p18Bmc9a044702@svn.freebsd.org> From: Xin LI Date: Tue, 8 Feb 2011 11:48:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218433 - stable/8/usr.sbin/rtadvd X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 11:48:39 -0000 Author: delphij Date: Tue Feb 8 11:48:37 2011 New Revision: 218433 URL: http://svn.freebsd.org/changeset/base/218433 Log: MFC r216675: Allow overriding pidfile and dumpfile. PR: bin/153362 Submitted by: Joe Holden Modified: stable/8/usr.sbin/rtadvd/Makefile stable/8/usr.sbin/rtadvd/rtadvd.8 stable/8/usr.sbin/rtadvd/rtadvd.c Directory Properties: stable/8/usr.sbin/rtadvd/ (props changed) Modified: stable/8/usr.sbin/rtadvd/Makefile ============================================================================== --- stable/8/usr.sbin/rtadvd/Makefile Tue Feb 8 11:32:22 2011 (r218432) +++ stable/8/usr.sbin/rtadvd/Makefile Tue Feb 8 11:48:37 2011 (r218433) @@ -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/8/usr.sbin/rtadvd/rtadvd.8 ============================================================================== --- stable/8/usr.sbin/rtadvd/rtadvd.8 Tue Feb 8 11:32:22 2011 (r218432) +++ stable/8/usr.sbin/rtadvd/rtadvd.8 Tue Feb 8 11:48:37 2011 (r218433) @@ -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 @@ -167,10 +182,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/8/usr.sbin/rtadvd/rtadvd.c ============================================================================== --- stable/8/usr.sbin/rtadvd/rtadvd.c Tue Feb 8 11:32:22 2011 (r218432) +++ stable/8/usr.sbin/rtadvd/rtadvd.c Tue Feb 8 11:48:37 2011 (r218433) @@ -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@FreeBSD.ORG Tue Feb 8 11:48:47 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Tue Feb 8 20:28:36 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDE09106564A; Tue, 8 Feb 2011 20:28:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AB7A88FC1A; Tue, 8 Feb 2011 20:28: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 p18KSagd058762; Tue, 8 Feb 2011 20:28:36 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18KSafB058760; Tue, 8 Feb 2011 20:28:36 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102082028.p18KSafB058760@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 8 Feb 2011 20:28:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218454 - stable/8/sys/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 20:28:36 -0000 Author: kib Date: Tue Feb 8 20:28:36 2011 New Revision: 218454 URL: http://svn.freebsd.org/changeset/base/218454 Log: MFC r206903 (by imp): Make this file more C++ friendly. Approved by: imp Found by: jkim Modified: stable/8/sys/sys/thr.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/sys/thr.h ============================================================================== --- stable/8/sys/sys/thr.h Tue Feb 8 20:16:43 2011 (r218453) +++ stable/8/sys/sys/thr.h Tue Feb 8 20:28:36 2011 (r218454) @@ -30,6 +30,7 @@ #ifndef _SYS_THR_H_ #define _SYS_THR_H_ +#include #include #include @@ -68,6 +69,7 @@ typedef __pid_t pid_t; #define _PID_T_DECLARED #endif +__BEGIN_DECLS int thr_create(ucontext_t *ctx, long *id, int flags); int thr_new(struct thr_param *param, int param_size); int thr_self(long *id); @@ -77,7 +79,7 @@ int thr_kill2(pid_t pid, long id, int si int thr_suspend(const struct timespec *timeout); int thr_wake(long id); int thr_set_name(long id, const char *name); - +__END_DECLS #endif /* !_KERNEL */ #endif /* ! _SYS_THR_H_ */ From owner-svn-src-stable@FreeBSD.ORG Tue Feb 8 21:05:08 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Tue Feb 8 22:08:01 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 268E0106566C; Tue, 8 Feb 2011 22:08:01 +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 12D168FC16; Tue, 8 Feb 2011 22:08:01 +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 p18M80Og061295; Tue, 8 Feb 2011 22:08:00 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18M80cl061287; Tue, 8 Feb 2011 22:08:00 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102082208.p18M80cl061287@svn.freebsd.org> From: Marius Strobl Date: Tue, 8 Feb 2011 22:08:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218458 - in stable/8/sys: sparc64/include sparc64/pci sparc64/sbus sparc64/sparc64 sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2011 22:08:01 -0000 Author: marius Date: Tue Feb 8 22:08:00 2011 New Revision: 218458 URL: http://svn.freebsd.org/changeset/base/218458 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/8/sys/sparc64/include/intr_machdep.h stable/8/sys/sparc64/pci/fire.c stable/8/sys/sparc64/pci/psycho.c stable/8/sys/sparc64/pci/schizo.c stable/8/sys/sparc64/sbus/sbus.c stable/8/sys/sparc64/sparc64/intr_machdep.c stable/8/sys/sys/bus.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/sparc64/include/intr_machdep.h ============================================================================== --- stable/8/sys/sparc64/include/intr_machdep.h Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/include/intr_machdep.h Tue Feb 8 22:08:00 2011 (r218458) @@ -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/8/sys/sparc64/pci/fire.c ============================================================================== --- stable/8/sys/sparc64/pci/fire.c Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/pci/fire.c Tue Feb 8 22:08:00 2011 (r218458) @@ -836,7 +836,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/8/sys/sparc64/pci/psycho.c ============================================================================== --- stable/8/sys/sparc64/pci/psycho.c Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/pci/psycho.c Tue Feb 8 22:08:00 2011 (r218458) @@ -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/8/sys/sparc64/pci/schizo.c ============================================================================== --- stable/8/sys/sparc64/pci/schizo.c Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/pci/schizo.c Tue Feb 8 22:08:00 2011 (r218458) @@ -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/8/sys/sparc64/sbus/sbus.c ============================================================================== --- stable/8/sys/sparc64/sbus/sbus.c Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/sbus/sbus.c Tue Feb 8 22:08:00 2011 (r218458) @@ -459,7 +459,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; @@ -469,7 +469,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/8/sys/sparc64/sparc64/intr_machdep.c ============================================================================== --- stable/8/sys/sparc64/sparc64/intr_machdep.c Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sparc64/sparc64/intr_machdep.c Tue Feb 8 22:08:00 2011 (r218458) @@ -98,7 +98,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 */ }; @@ -327,10 +327,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]; @@ -348,7 +348,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/8/sys/sys/bus.h ============================================================================== --- stable/8/sys/sys/bus.h Tue Feb 8 21:58:13 2011 (r218457) +++ stable/8/sys/sys/bus.h Tue Feb 8 22:08:00 2011 (r218458) @@ -194,7 +194,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@FreeBSD.ORG Tue Feb 8 22:14:19 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Wed Feb 9 15:32:05 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 101BE106564A; Wed, 9 Feb 2011 15:32:05 +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 F26EC8FC15; Wed, 9 Feb 2011 15:32: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 p19FW4cR088638; Wed, 9 Feb 2011 15:32:04 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p19FW4U2088636; Wed, 9 Feb 2011 15:32:04 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102091532.p19FW4U2088636@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 9 Feb 2011 15:32:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218484 - stable/8/sys/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2011 15:32:05 -0000 Author: pluknet Date: Wed Feb 9 15:32:04 2011 New Revision: 218484 URL: http://svn.freebsd.org/changeset/base/218484 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/8/sys/conf/kern.pre.mk Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/conf/kern.pre.mk ============================================================================== --- stable/8/sys/conf/kern.pre.mk Wed Feb 9 15:23:16 2011 (r218483) +++ stable/8/sys/conf/kern.pre.mk Wed Feb 9 15:32:04 2011 (r218484) @@ -79,9 +79,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@FreeBSD.ORG Wed Feb 9 15:40:48 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Wed Feb 9 15:55:48 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1F9C106564A; Wed, 9 Feb 2011 15:55:48 +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 C0BAF8FC19; Wed, 9 Feb 2011 15:55: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 p19FtmLf089351; Wed, 9 Feb 2011 15:55:48 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p19FtmnP089349; Wed, 9 Feb 2011 15:55:48 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102091555.p19FtmnP089349@svn.freebsd.org> From: Jaakko Heinonen Date: Wed, 9 Feb 2011 15:55:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218489 - stable/8/etc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2011 15:55:48 -0000 Author: jh Date: Wed Feb 9 15:55:48 2011 New Revision: 218489 URL: http://svn.freebsd.org/changeset/base/218489 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/8/etc/rc.subr Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/rc.subr ============================================================================== --- stable/8/etc/rc.subr Wed Feb 9 15:43:38 2011 (r218488) +++ stable/8/etc/rc.subr Wed Feb 9 15:55:48 2011 (r218489) @@ -1348,7 +1348,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@FreeBSD.ORG Thu Feb 10 00:20:57 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 05:37:06 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AC391065670; Fri, 11 Feb 2011 05:37:06 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 774358FC14; Fri, 11 Feb 2011 05:37: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 p1B5b6Fv046774; Fri, 11 Feb 2011 05:37:06 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5b6lB046766; Fri, 11 Feb 2011 05:37:06 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201102110537.p1B5b6lB046766@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 11 Feb 2011 05:37:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218536 - in stable/8/sys: geom/part sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:37:06 -0000 Author: ae Date: Fri Feb 11 05:37:05 2011 New Revision: 218536 URL: http://svn.freebsd.org/changeset/base/218536 Log: MFC r218014: Add new user-friendly aliases for partition types for the MBR and EBR schemes: fat32, ebr, linux-data, linux-raid, linux-swap and linux-lvm. Add bios-boot GUID and alias for the GPT scheme. It used by GRUB 2 loader. Also do sorting definitions of types in diskmbr.h and in g_part.c. PR: bin/120990, kern/147664 Modified: stable/8/sys/geom/part/g_part.c stable/8/sys/geom/part/g_part.h stable/8/sys/geom/part/g_part_ebr.c stable/8/sys/geom/part/g_part_gpt.c stable/8/sys/geom/part/g_part_mbr.c stable/8/sys/sys/diskmbr.h stable/8/sys/sys/gpt.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/geom/part/g_part.c ============================================================================== --- stable/8/sys/geom/part/g_part.c Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/geom/part/g_part.c Fri Feb 11 05:37:05 2011 (r218536) @@ -76,7 +76,10 @@ struct g_part_alias_list { { "apple-raid-offline", G_PART_ALIAS_APPLE_RAID_OFFLINE }, { "apple-tv-recovery", G_PART_ALIAS_APPLE_TV_RECOVERY }, { "apple-ufs", G_PART_ALIAS_APPLE_UFS }, + { "bios-boot", G_PART_ALIAS_BIOS_BOOT }, + { "ebr", G_PART_ALIAS_EBR }, { "efi", G_PART_ALIAS_EFI }, + { "fat32", G_PART_ALIAS_MS_FAT32 }, { "freebsd", G_PART_ALIAS_FREEBSD }, { "freebsd-boot", G_PART_ALIAS_FREEBSD_BOOT }, { "freebsd-swap", G_PART_ALIAS_FREEBSD_SWAP }, @@ -87,6 +90,7 @@ struct g_part_alias_list { { "linux-lvm", G_PART_ALIAS_LINUX_LVM }, { "linux-raid", G_PART_ALIAS_LINUX_RAID }, { "linux-swap", G_PART_ALIAS_LINUX_SWAP }, + { "mbr", G_PART_ALIAS_MBR }, { "ms-basic-data", G_PART_ALIAS_MS_BASIC_DATA }, { "ms-ldm-data", G_PART_ALIAS_MS_LDM_DATA }, { "ms-ldm-metadata", G_PART_ALIAS_MS_LDM_METADATA }, @@ -98,7 +102,6 @@ struct g_part_alias_list { { "netbsd-lfs", G_PART_ALIAS_NETBSD_LFS }, { "netbsd-raid", G_PART_ALIAS_NETBSD_RAID }, { "netbsd-swap", G_PART_ALIAS_NETBSD_SWAP }, - { "mbr", G_PART_ALIAS_MBR } }; /* Modified: stable/8/sys/geom/part/g_part.h ============================================================================== --- stable/8/sys/geom/part/g_part.h Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/geom/part/g_part.h Fri Feb 11 05:37:05 2011 (r218536) @@ -66,6 +66,9 @@ enum g_part_alias { G_PART_ALIAS_NETBSD_RAID, /* A NetBSD RAID partition entry. */ G_PART_ALIAS_NETBSD_SWAP, /* A NetBSD swap partition entry. */ G_PART_ALIAS_NETBSD_LFS, /* A NetBSD LFS partition entry. */ + G_PART_ALIAS_EBR, /* A EBR partition entry. */ + G_PART_ALIAS_MS_FAT32, /* A Microsoft FAT32 partition entry. */ + G_PART_ALIAS_BIOS_BOOT, /* A GRUB 2 boot partition entry. */ /* Keep the following last */ G_PART_ALIAS_COUNT }; Modified: stable/8/sys/geom/part/g_part_ebr.c ============================================================================== --- stable/8/sys/geom/part/g_part_ebr.c Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/geom/part/g_part_ebr.c Fri Feb 11 05:37:05 2011 (r218536) @@ -113,6 +113,19 @@ static struct g_part_scheme g_part_ebr_s }; G_PART_SCHEME_DECLARE(g_part_ebr); +static struct g_part_ebr_alias { + u_char typ; + int alias; +} ebr_alias_match[] = { + { DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD }, + { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS }, + { DOSPTYP_FAT32, G_PART_ALIAS_MS_FAT32 }, + { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP }, + { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA }, + { DOSPTYP_LINLVM, G_PART_ALIAS_LINUX_LVM }, + { DOSPTYP_LINRAID, G_PART_ALIAS_LINUX_RAID }, +}; + static void ebr_set_chs(struct g_part_table *, uint32_t, u_char *, u_char *, u_char *); @@ -152,6 +165,7 @@ ebr_parse_type(const char *type, u_char const char *alias; char *endp; long lt; + int i; if (type[0] == '!') { lt = strtol(type + 1, &endp, 0); @@ -160,14 +174,18 @@ ebr_parse_type(const char *type, u_char *dp_typ = (u_char)lt; return (0); } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD); - if (!strcasecmp(type, alias)) { - *dp_typ = DOSPTYP_386BSD; - return (0); + for (i = 0; + i < sizeof(ebr_alias_match) / sizeof(ebr_alias_match[0]); i++) { + alias = g_part_alias_name(ebr_alias_match[i].alias); + if (strcasecmp(type, alias) == 0) { + *dp_typ = ebr_alias_match[i].typ; + return (0); + } } return (EINVAL); } + static void ebr_set_chs(struct g_part_table *table, uint32_t lba, u_char *cylp, u_char *hdp, u_char *secp) @@ -537,13 +555,15 @@ g_part_ebr_type(struct g_part_table *bas char *buf, size_t bufsz) { struct g_part_ebr_entry *entry; - int type; + int i; entry = (struct g_part_ebr_entry *)baseentry; - type = entry->ent.dp_typ; - if (type == DOSPTYP_386BSD) - return (g_part_alias_name(G_PART_ALIAS_FREEBSD)); - snprintf(buf, bufsz, "!%d", type); + for (i = 0; + i < sizeof(ebr_alias_match) / sizeof(ebr_alias_match[0]); i++) { + if (ebr_alias_match[i].typ == entry->ent.dp_typ) + return (g_part_alias_name(ebr_alias_match[i].alias)); + } + snprintf(buf, bufsz, "!%d", entry->ent.dp_typ); return (buf); } Modified: stable/8/sys/geom/part/g_part_gpt.c ============================================================================== --- stable/8/sys/geom/part/g_part_gpt.c Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/geom/part/g_part_gpt.c Fri Feb 11 05:37:05 2011 (r218536) @@ -146,6 +146,7 @@ static struct uuid gpt_uuid_apple_raid = static struct uuid gpt_uuid_apple_raid_offline = GPT_ENT_TYPE_APPLE_RAID_OFFLINE; static struct uuid gpt_uuid_apple_tv_recovery = GPT_ENT_TYPE_APPLE_TV_RECOVERY; static struct uuid gpt_uuid_apple_ufs = GPT_ENT_TYPE_APPLE_UFS; +static struct uuid gpt_uuid_bios_boot = GPT_ENT_TYPE_BIOS_BOOT; static struct uuid gpt_uuid_efi = GPT_ENT_TYPE_EFI; static struct uuid gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD; static struct uuid gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT; @@ -181,6 +182,7 @@ static struct g_part_uuid_alias { { &gpt_uuid_apple_raid_offline, G_PART_ALIAS_APPLE_RAID_OFFLINE }, { &gpt_uuid_apple_tv_recovery, G_PART_ALIAS_APPLE_TV_RECOVERY }, { &gpt_uuid_apple_ufs, G_PART_ALIAS_APPLE_UFS }, + { &gpt_uuid_bios_boot, G_PART_ALIAS_BIOS_BOOT }, { &gpt_uuid_efi, G_PART_ALIAS_EFI }, { &gpt_uuid_freebsd, G_PART_ALIAS_FREEBSD }, { &gpt_uuid_freebsd_boot, G_PART_ALIAS_FREEBSD_BOOT }, Modified: stable/8/sys/geom/part/g_part_mbr.c ============================================================================== --- stable/8/sys/geom/part/g_part_mbr.c Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/geom/part/g_part_mbr.c Fri Feb 11 05:37:05 2011 (r218536) @@ -108,12 +108,27 @@ static struct g_part_scheme g_part_mbr_s }; G_PART_SCHEME_DECLARE(g_part_mbr); +static struct g_part_mbr_alias { + u_char typ; + int alias; +} mbr_alias_match[] = { + { DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD }, + { DOSPTYP_EXT, G_PART_ALIAS_EBR }, + { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS }, + { DOSPTYP_FAT32, G_PART_ALIAS_MS_FAT32 }, + { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP }, + { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA }, + { DOSPTYP_LINLVM, G_PART_ALIAS_LINUX_LVM }, + { DOSPTYP_LINRAID, G_PART_ALIAS_LINUX_RAID }, +}; + static int mbr_parse_type(const char *type, u_char *dp_typ) { const char *alias; char *endp; long lt; + int i; if (type[0] == '!') { lt = strtol(type + 1, &endp, 0); @@ -122,15 +137,13 @@ mbr_parse_type(const char *type, u_char *dp_typ = (u_char)lt; return (0); } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD); - if (!strcasecmp(type, alias)) { - *dp_typ = DOSPTYP_386BSD; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_MS_NTFS); - if (!strcasecmp(type, alias)) { - *dp_typ = DOSPTYP_NTFS; - return (0); + for (i = 0; + i < sizeof(mbr_alias_match) / sizeof(mbr_alias_match[0]); i++) { + alias = g_part_alias_name(mbr_alias_match[i].alias); + if (strcasecmp(type, alias) == 0) { + *dp_typ = mbr_alias_match[i].typ; + return (0); + } } return (EINVAL); } @@ -511,18 +524,15 @@ g_part_mbr_type(struct g_part_table *bas char *buf, size_t bufsz) { struct g_part_mbr_entry *entry; - int type; + int i; entry = (struct g_part_mbr_entry *)baseentry; - type = entry->ent.dp_typ; - switch (type) { - case DOSPTYP_386BSD: - return (g_part_alias_name(G_PART_ALIAS_FREEBSD)); - case DOSPTYP_NTFS: - return (g_part_alias_name(G_PART_ALIAS_MS_NTFS)); - default: - snprintf(buf, bufsz, "!%d", type); + for (i = 0; + i < sizeof(mbr_alias_match) / sizeof(mbr_alias_match[0]); i++) { + if (mbr_alias_match[i].typ == entry->ent.dp_typ) + return (g_part_alias_name(mbr_alias_match[i].alias)); } + snprintf(buf, bufsz, "!%d", entry->ent.dp_typ); return (buf); } Modified: stable/8/sys/sys/diskmbr.h ============================================================================== --- stable/8/sys/sys/diskmbr.h Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/sys/diskmbr.h Fri Feb 11 05:37:05 2011 (r218536) @@ -43,13 +43,16 @@ #define DOSMAGICOFFSET 510 #define DOSMAGIC 0xAA55 +#define DOSPTYP_EXT 0x05 /* DOS extended partition */ +#define DOSPTYP_NTFS 0x07 /* NTFS partition */ +#define DOSPTYP_FAT32 0x0b /* FAT32 partition */ +#define DOSPTYP_EXTLBA 0x0f /* DOS extended partition */ #define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */ #define DOSPTYP_LINSWP 0x82 /* Linux swap partition */ #define DOSPTYP_LINUX 0x83 /* Linux partition */ +#define DOSPTYP_LINLVM 0x8e /* Linux LVM partition */ #define DOSPTYP_PMBR 0xee /* GPT Protective MBR */ -#define DOSPTYP_EXT 5 /* DOS extended partition */ -#define DOSPTYP_EXTLBA 15 /* DOS extended partition */ -#define DOSPTYP_NTFS 0x07 /* NTFS partition */ +#define DOSPTYP_LINRAID 0xfd /* Linux raid partition */ struct dos_partition { unsigned char dp_flag; /* bootstrap flags */ Modified: stable/8/sys/sys/gpt.h ============================================================================== --- stable/8/sys/sys/gpt.h Fri Feb 11 05:33:35 2011 (r218535) +++ stable/8/sys/sys/gpt.h Fri Feb 11 05:37:05 2011 (r218536) @@ -150,4 +150,10 @@ struct gpt_ent { #define GPT_ENT_TYPE_NETBSD_CGD \ {0x2db519ec,0xb10f,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}} +/* + * Boot partition used by GRUB 2. + */ +#define GPT_ENT_TYPE_BIOS_BOOT \ + {0x21686148,0x6449,0x6e6f,0x74,0x4e,{0x65,0x65,0x64,0x45,0x46,0x49}} + #endif /* _SYS_GPT_H_ */ From owner-svn-src-stable@FreeBSD.ORG Fri Feb 11 05:48:45 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B2A51065672; Fri, 11 Feb 2011 05:48:45 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1838A8FC0A; Fri, 11 Feb 2011 05:48:45 +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 p1B5mii5047141; Fri, 11 Feb 2011 05:48:44 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5mies047139; Fri, 11 Feb 2011 05:48:44 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201102110548.p1B5mies047139@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 11 Feb 2011 05:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218537 - stable/8/sbin/geom/class/part X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:48:45 -0000 Author: ae Date: Fri Feb 11 05:48:44 2011 New Revision: 218537 URL: http://svn.freebsd.org/changeset/base/218537 Log: MFC r217314: Fix up the grammar. PR: docs/153933 MFC r217342,217343,217344 by maxim: o Typo fixes. o Start each sentence on a new line. No content changes. o Somehow I revert Dd macro in the previous commit. MFC r218015: Document the "bios-boot" partition type. Modified: stable/8/sbin/geom/class/part/gpart.8 Directory Properties: stable/8/sbin/geom/class/part/ (props changed) Modified: stable/8/sbin/geom/class/part/gpart.8 ============================================================================== --- stable/8/sbin/geom/class/part/gpart.8 Fri Feb 11 05:37:05 2011 (r218536) +++ stable/8/sbin/geom/class/part/gpart.8 Fri Feb 11 05:48:44 2011 (r218537) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 22, 2010 +.Dd January 28, 2011 .Dt GPART 8 .Os .Sh NAME @@ -422,8 +422,9 @@ about its use. .It Cm restore Restore the partition table from backup previously created by .Cm backup -action and given from standard input. Only partition table -may be restored. This action does not affect content of partitions. +action and given from standard input. +Only partition table may be restored. +This action does not affect content of partitions. This mean that you should copy your data from backup after restoring partition table and write bootcode again if it is needed. .Pp @@ -508,6 +509,11 @@ utility also allows the user to specify for partition types that do not have symbol names. The symbolic names currently understood are: .Bl -tag -width ".Cm freebsd-vinum" +.It Cm bios-boot +The system partition dedicated to second stage of the boot loader program. +Usually it used by GRUB 2 loader when the partition table is GPT. +The scheme-specific type is +.Qq Li "!21686148-6449-6E6F-744E-656564454649" . .It Cm efi The system partition for computers that use the Extensible Firmware Interface (EFI). @@ -703,20 +709,23 @@ action. .Sh RECOVERING The GEOM class PART supports recovering of partition tables only for GPT. The GUID partition table has a primary and secondary (backup) copy of -metadata for redundance. They are stored in the begining and in the end -of device respectively. Therefore it is acceptable to have some corruptions -in the metadata that are not fatal to work with GPT. When kernel detects -corrupt metadata it marks this table as corrupt and reports about corruption. +metadata for redundance. +They are stored in the begining and in the end of device respectively. +Therefore it is acceptable to have some corruptions in the metadata that +are not fatal to work with GPT. +When kernel detects corrupt metadata it marks this table as corrupt and +reports about corruption. Any changes in corrupt table are prohibited except .Cm destroy and .Cm recover . .Pp In case when only first sector is corrupt kernel can not detect GPT even -if partition table is not corrupt. You can write protective MBR with +if partition table is not corrupt. +You can write protective MBR with .Xr dd 1 -command to restore ability of GPT detection. The copy of protective MBR is -usually located in the +command to restore ability of GPT detection. +The copy of protective MBR is usually located in the .Pa /boot/pmbr file. .Pp @@ -743,25 +752,27 @@ and will report about corrupt table. .Pp In case when the size of device has changed (e.g. volume expansion) the -secondary GPT header will become located not in the last sector. This is -not a metadata corruption, but it is dangerous because any corruption of -the primary GPT will lead to lost of partition table. Kernel reports about -this problem with message: +secondary GPT header will become located not in the last sector. +This is not a metadata corruption, but it is dangerous because any +corruption of the primary GPT will lead to lost of partition table. +Kernel reports about this problem with message: .Bd -literal -offset indent GEOM: provider: the secondary GPT header is not in the last LBA. .Ed .Pp A corrupt table can be recovered with .Cm gpart recover -command. This command does reconstruction of corrupt metadata using -known valid metadata. Also it can relocate secondary GPT to the end of -device. +command. +This command does reconstruction of corrupt metadata using +known valid metadata. +Also it can relocate secondary GPT to the end of device. .Pp .Pa NOTE : The GEOM class PART can detect the same partition table on different GEOM -providers and some of them will marked as corrupt. Be careful when choising -a provider for recovering. If you did incorrect choise you can destroy -metadata of another GEOM class, e.g. GEOM MIRROR or GEOM LABEL. +providers and some of them will be marked as corrupt. +Be careful when choosing a provider for recovering. +If you choose incorrectly you can destroy the metadata of another GEOM class, +e.g. GEOM MIRROR or GEOM LABEL. .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. .Sh EXAMPLES From owner-svn-src-stable@FreeBSD.ORG Fri Feb 11 05:53:46 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EEFE1065672; Fri, 11 Feb 2011 05:53: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 5CF828FC12; Fri, 11 Feb 2011 05:53: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 p1B5rkNh047345; Fri, 11 Feb 2011 05:53:46 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5rkD3047343; Fri, 11 Feb 2011 05:53:46 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102110553.p1B5rkD3047343@svn.freebsd.org> From: Doug Barton Date: Fri, 11 Feb 2011 05:53:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218539 - stable/8/etc/rc.d X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:53:46 -0000 Author: dougb Date: Fri Feb 11 05:53:46 2011 New Revision: 218539 URL: http://svn.freebsd.org/changeset/base/218539 Log: MFC 218142: Let rpcbind clean up after itself Modified: stable/8/etc/rc.d/rpcbind Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/rc.d/rpcbind ============================================================================== --- stable/8/etc/rc.d/rpcbind Fri Feb 11 05:50:28 2011 (r218538) +++ stable/8/etc/rc.d/rpcbind Fri Feb 11 05:53:46 2011 (r218539) @@ -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@FreeBSD.ORG Fri Feb 11 05:54:46 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 05:56:15 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CE18106566C; Fri, 11 Feb 2011 05:56:15 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A0618FC15; Fri, 11 Feb 2011 05:56:15 +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 p1B5uF8n047527; Fri, 11 Feb 2011 05:56:15 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5uFo8047525; Fri, 11 Feb 2011 05:56:15 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201102110556.p1B5uFo8047525@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 11 Feb 2011 05:56:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218541 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:56:15 -0000 Author: ae Date: Fri Feb 11 05:56:14 2011 New Revision: 218541 URL: http://svn.freebsd.org/changeset/base/218541 Log: MFC r218278: vdev's sectorsize should not be greater than 8 Kbytes and also it should be power of 2. This prevents non-aligned access while probing vdev's labels. PR: kern/147852 Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Fri Feb 11 05:54:46 2011 (r218540) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Fri Feb 11 05:56:14 2011 (r218541) @@ -392,7 +392,8 @@ vdev_geom_open_by_path(vdev_t *vd, int c if (pp != NULL) { ZFS_LOG(1, "Found provider by name %s.", vd->vdev_path); cp = vdev_geom_attach(pp); - if (cp != NULL && check_guid) { + if (cp != NULL && check_guid && ISP2(pp->sectorsize) && + pp->sectorsize <= VDEV_PAD_SIZE) { g_topology_unlock(); guid = vdev_geom_read_guid(cp); g_topology_lock(); @@ -456,6 +457,17 @@ vdev_geom_open(vdev_t *vd, uint64_t *psi if (cp == NULL) { ZFS_LOG(1, "Provider %s not found.", vd->vdev_path); error = ENOENT; + } else if (cp->provider->sectorsize > VDEV_PAD_SIZE || + !ISP2(cp->provider->sectorsize)) { + ZFS_LOG(1, "Provider %s has unsupported sectorsize.", + vd->vdev_path); + + g_topology_lock(); + vdev_geom_detach(cp, 0); + g_topology_unlock(); + + error = EINVAL; + cp = NULL; } else if (cp->acw == 0 && (spa_mode(vd->vdev_spa) & FWRITE) != 0) { int i; From owner-svn-src-stable@FreeBSD.ORG Fri Feb 11 05:56:48 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7CC210656C6; Fri, 11 Feb 2011 05:56:48 +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 B50FD8FC14; Fri, 11 Feb 2011 05:56: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 p1B5umKj047572; Fri, 11 Feb 2011 05:56:48 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B5um4f047570; Fri, 11 Feb 2011 05:56:48 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102110556.p1B5um4f047570@svn.freebsd.org> From: Doug Barton Date: Fri, 11 Feb 2011 05:56:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218542 - stable/8/etc/namedb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 05:56:49 -0000 Author: dougb Date: Fri Feb 11 05:56:48 2011 New Revision: 218542 URL: http://svn.freebsd.org/changeset/base/218542 Log: MFC 218350: Catch up with reality and references from the latest RFCs (especially 5735) for our default empty zones. Modified: stable/8/etc/namedb/named.conf Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/namedb/named.conf ============================================================================== --- stable/8/etc/namedb/named.conf Fri Feb 11 05:56:14 2011 (r218541) +++ stable/8/etc/namedb/named.conf Fri Feb 11 05:56:48 2011 (r218542) @@ -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@FreeBSD.ORG Fri Feb 11 05:57:33 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 10:06:49 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 13:52:55 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9124F106564A; Fri, 11 Feb 2011 13:52:55 +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 48C0B8FC0A; Fri, 11 Feb 2011 13:52:55 +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 p1BDqtba061855; Fri, 11 Feb 2011 13:52:55 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDqtPS061853; Fri, 11 Feb 2011 13:52:55 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111352.p1BDqtPS061853@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:52:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218560 - stable/8/usr.bin/gzip X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:52:55 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:52:55 2011 New Revision: 218560 URL: http://svn.freebsd.org/changeset/base/218560 Log: MFC 218421: Remove CRT reference from zmore(1). PR: 154441 Approved by: keramida (mentor) Modified: stable/8/usr.bin/gzip/zmore.1 Directory Properties: stable/8/usr.bin/gzip/ (props changed) Modified: stable/8/usr.bin/gzip/zmore.1 ============================================================================== --- stable/8/usr.bin/gzip/zmore.1 Fri Feb 11 13:27:00 2011 (r218559) +++ stable/8/usr.bin/gzip/zmore.1 Fri Feb 11 13:52:55 2011 (r218560) @@ -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@FreeBSD.ORG Fri Feb 11 13:53:39 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 13:55:28 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 368C210656A7; Fri, 11 Feb 2011 13:55: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 2583E8FC15; Fri, 11 Feb 2011 13:55: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 p1BDtSLs062013; Fri, 11 Feb 2011 13:55:28 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDtS8d062011; Fri, 11 Feb 2011 13:55:28 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111355.p1BDtS8d062011@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:55:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218562 - stable/8/share/man/man4 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:55:28 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:55:27 2011 New Revision: 218562 URL: http://svn.freebsd.org/changeset/base/218562 Log: MFC 218398: Fix typo in amdtemp(4). Approved by: keramida (mentor) Modified: stable/8/share/man/man4/amdtemp.4 Directory Properties: stable/8/share/man/man4/ (props changed) Modified: stable/8/share/man/man4/amdtemp.4 ============================================================================== --- stable/8/share/man/man4/amdtemp.4 Fri Feb 11 13:53:39 2011 (r218561) +++ stable/8/share/man/man4/amdtemp.4 Fri Feb 11 13:55:27 2011 (r218562) @@ -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@FreeBSD.ORG Fri Feb 11 13:56:06 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 13:58:31 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D849106566C; Fri, 11 Feb 2011 13:58:31 +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 0C3D68FC0C; Fri, 11 Feb 2011 13:58:31 +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 p1BDwUP3062167; Fri, 11 Feb 2011 13:58:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BDwUSH062165; Fri, 11 Feb 2011 13:58:30 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102111358.p1BDwUSH062165@svn.freebsd.org> From: Glen Barber Date: Fri, 11 Feb 2011 13:58:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218564 - stable/8/share/man/man9 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 13:58:31 -0000 Author: gjb (doc committer) Date: Fri Feb 11 13:58:30 2011 New Revision: 218564 URL: http://svn.freebsd.org/changeset/base/218564 Log: MFC 212440,212493,212500: Add RETURN VALUES section to devclass_get_maxunit(9). PR: 149979 Approved by: keramida (mentor) Modified: stable/8/share/man/man9/devclass_get_maxunit.9 Directory Properties: stable/8/share/man/man9/ (props changed) Modified: stable/8/share/man/man9/devclass_get_maxunit.9 ============================================================================== --- stable/8/share/man/man9/devclass_get_maxunit.9 Fri Feb 11 13:56:06 2011 (r218563) +++ stable/8/share/man/man9/devclass_get_maxunit.9 Fri Feb 11 13:58:30 2011 (r218564) @@ -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@FreeBSD.ORG Fri Feb 11 13:59:56 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Fri Feb 11 15:03:05 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2E731065673; Fri, 11 Feb 2011 15:03:05 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 90EC08FC2A; Fri, 11 Feb 2011 15:03:05 +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 p1BF35oR064238; Fri, 11 Feb 2011 15:03:05 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BF35B9064236; Fri, 11 Feb 2011 15:03:05 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102111503.p1BF35B9064236@svn.freebsd.org> From: Martin Matuska Date: Fri, 11 Feb 2011 15:03:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218571 - stable/8/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 15:03:05 -0000 Author: mm Date: Fri Feb 11 15:03:05 2011 New Revision: 218571 URL: http://svn.freebsd.org/changeset/base/218571 Log: Add release notes for xz update to 5.0.0. Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Fri Feb 11 14:55:17 2011 (r218570) +++ stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Fri Feb 11 15:03:05 2011 (r218571) @@ -1488,6 +1488,9 @@ kern.geom.label.gpt.enableThe timezone database has been updated to the tzdata2010j release. + + xz has been updated + from snapshot as of 12 April 2010 to 5.0.0. From owner-svn-src-stable@FreeBSD.ORG Fri Feb 11 15:12:31 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A2DF106564A; Fri, 11 Feb 2011 15:12:31 +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 786708FC08; Fri, 11 Feb 2011 15:12:31 +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 p1BFCVoj064569; Fri, 11 Feb 2011 15:12:31 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BFCVi0064567; Fri, 11 Feb 2011 15:12:31 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201102111512.p1BFCVi0064567@svn.freebsd.org> From: John Baldwin Date: Fri, 11 Feb 2011 15:12:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218573 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 15:12:31 -0000 Author: jhb Date: Fri Feb 11 15:12:31 2011 New Revision: 218573 URL: http://svn.freebsd.org/changeset/base/218573 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/8/sys/netinet/tcp_usrreq.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet/tcp_usrreq.c ============================================================================== --- stable/8/sys/netinet/tcp_usrreq.c Fri Feb 11 15:03:42 2011 (r218572) +++ stable/8/sys/netinet/tcp_usrreq.c Fri Feb 11 15:12:31 2011 (r218573) @@ -1334,9 +1334,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@FreeBSD.ORG Fri Feb 11 15:13:04 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Sat Feb 12 13:41:00 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5B47106564A; Sat, 12 Feb 2011 13:41:00 +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 8901F8FC12; Sat, 12 Feb 2011 13:41:00 +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 p1CDf0LG003333; Sat, 12 Feb 2011 13:41:00 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1CDf0Gi003330; Sat, 12 Feb 2011 13:41:00 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201102121341.p1CDf0Gi003330@svn.freebsd.org> From: Marius Strobl Date: Sat, 12 Feb 2011 13:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218606 - stable/8/sys/dev/sound/pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2011 13:41:00 -0000 Author: marius Date: Sat Feb 12 13:41:00 2011 New Revision: 218606 URL: http://svn.freebsd.org/changeset/base/218606 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/8/sys/dev/sound/pci/emu10k1.c stable/8/sys/dev/sound/pci/emu10kx.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/sound/pci/emu10k1.c ============================================================================== --- stable/8/sys/dev/sound/pci/emu10k1.c Sat Feb 12 13:28:50 2011 (r218605) +++ stable/8/sys/dev/sound/pci/emu10k1.c Sat Feb 12 13:41:00 2011 (r218606) @@ -2017,7 +2017,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/8/sys/dev/sound/pci/emu10kx.c ============================================================================== --- stable/8/sys/dev/sound/pci/emu10kx.c Sat Feb 12 13:28:50 2011 (r218605) +++ stable/8/sys/dev/sound/pci/emu10kx.c Sat Feb 12 13:41:00 2011 (r218606) @@ -2700,7 +2700,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@FreeBSD.ORG Sat Feb 12 13:41:05 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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@FreeBSD.ORG Sat Feb 12 17:57:57 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58CEE106566B; Sat, 12 Feb 2011 17:57:57 +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 2DF2C8FC15; Sat, 12 Feb 2011 17:57: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 p1CHvu0b009871; Sat, 12 Feb 2011 17:57:56 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1CHvuQv009868; Sat, 12 Feb 2011 17:57:56 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201102121757.p1CHvuQv009868@svn.freebsd.org> From: Glen Barber Date: Sat, 12 Feb 2011 17:57:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218614 - stable/8/share/man/man5 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2011 17:57:57 -0000 Author: gjb (doc committer) Date: Sat Feb 12 17:57:56 2011 New Revision: 218614 URL: http://svn.freebsd.org/changeset/base/218614 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/8/share/man/man5/devfs.5 stable/8/share/man/man5/fdescfs.5 Directory Properties: stable/8/share/man/man5/ (props changed) Modified: stable/8/share/man/man5/devfs.5 ============================================================================== --- stable/8/share/man/man5/devfs.5 Sat Feb 12 16:33:00 2011 (r218613) +++ stable/8/share/man/man5/devfs.5 Sat Feb 12 17:57:56 2011 (r218614) @@ -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/8/share/man/man5/fdescfs.5 ============================================================================== --- stable/8/share/man/man5/fdescfs.5 Sat Feb 12 16:33:00 2011 (r218613) +++ stable/8/share/man/man5/fdescfs.5 Sat Feb 12 17:57:56 2011 (r218614) @@ -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 From owner-svn-src-stable@FreeBSD.ORG Sat Feb 12 17:58:37 2011 Return-Path: Delivered-To: svn-src-stable@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@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the 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