From owner-svn-src-stable-8@FreeBSD.ORG Sun Jul 14 21:57:27 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B5D8BD1E; Sun, 14 Jul 2013 21:57:27 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 973DA16D; Sun, 14 Jul 2013 21:57:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ELvRKp016232; Sun, 14 Jul 2013 21:57:27 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6ELvQVl016229; Sun, 14 Jul 2013 21:57:26 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201307142157.r6ELvQVl016229@svn.freebsd.org> From: Sergey Kandaurov Date: Sun, 14 Jul 2013 21:57:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253343 - in stable/8: bin/chmod bin/ls lib/libc/sys X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 21:57:27 -0000 Author: pluknet Date: Sun Jul 14 21:57:25 2013 New Revision: 253343 URL: http://svnweb.freebsd.org/changeset/base/253343 Log: MFC r221845: Update sticky(7) cross references. MFC reminded by: Torfinn Ingolfsen Modified: stable/8/bin/chmod/chmod.1 stable/8/bin/ls/ls.1 stable/8/lib/libc/sys/chmod.2 stable/8/lib/libc/sys/stat.2 Directory Properties: stable/8/bin/chmod/ (props changed) stable/8/bin/ls/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/libc/sys/ (props changed) Modified: stable/8/bin/chmod/chmod.1 ============================================================================== --- stable/8/bin/chmod/chmod.1 Sun Jul 14 20:22:16 2013 (r253342) +++ stable/8/bin/chmod/chmod.1 Sun Jul 14 21:57:25 2013 (r253343) @@ -134,7 +134,7 @@ will run with effective gid set to the g See .Xr chmod 2 and -.Xr sticky 8 . +.Xr sticky 7 . .It Li 0400 Allow read by owner. .It Li 0200 @@ -325,10 +325,10 @@ option is non-standard and its use in sc .Xr umask 2 , .Xr fts 3 , .Xr setmode 3 , +.Xr sticky 7 , .Xr symlink 7 , .Xr chown 8 , -.Xr mount 8 , -.Xr sticky 8 +.Xr mount 8 .Sh STANDARDS The .Nm Modified: stable/8/bin/ls/ls.1 ============================================================================== --- stable/8/bin/ls/ls.1 Sun Jul 14 20:22:16 2013 (r253342) +++ stable/8/bin/ls/ls.1 Sun Jul 14 21:57:25 2013 (r253343) @@ -459,7 +459,7 @@ but not execute or search permission. (See .Xr chmod 1 or -.Xr sticky 8 . ) +.Xr sticky 7 . ) .It Sy t The sticky bit is set (mode .Li 1000 ) , @@ -467,7 +467,7 @@ and is searchable or executable. (See .Xr chmod 1 or -.Xr sticky 8 . ) +.Xr sticky 7 . ) .El .El .Pp @@ -683,9 +683,9 @@ specification. .Xr strmode 3 , .Xr termcap 5 , .Xr maclabel 7 , +.Xr sticky 7 , .Xr symlink 7 , -.Xr getfmac 8 , -.Xr sticky 8 +.Xr getfmac 8 .Sh STANDARDS With the exception of options .Fl I , g , n Modified: stable/8/lib/libc/sys/chmod.2 ============================================================================== --- stable/8/lib/libc/sys/chmod.2 Sun Jul 14 20:22:16 2013 (r253342) +++ stable/8/lib/libc/sys/chmod.2 Sun Jul 14 21:57:25 2013 (r253343) @@ -161,7 +161,7 @@ The sticky bit may be set by any user on a directory which the user owns or has appropriate permissions. For more details of the properties of the sticky bit, see -.Xr sticky 8 . +.Xr sticky 7 . .Pp If mode ISUID (set UID) is set on a directory, and the MNT_SUIDDIR option was used in the mount of the file system, @@ -289,7 +289,7 @@ nor a file descriptor associated with a .Xr chown 2 , .Xr open 2 , .Xr stat 2 , -.Xr sticky 8 +.Xr sticky 7 .Sh STANDARDS The .Fn chmod Modified: stable/8/lib/libc/sys/stat.2 ============================================================================== --- stable/8/lib/libc/sys/stat.2 Sun Jul 14 20:22:16 2013 (r253342) +++ stable/8/lib/libc/sys/stat.2 Sun Jul 14 21:57:25 2013 (r253343) @@ -395,8 +395,8 @@ nor a file descriptor associated with a .Xr fhstat 2 , .Xr statfs 2 , .Xr utimes 2 , -.Xr symlink 7 , -.Xr sticky 8 +.Xr sticky 7 , +.Xr symlink 7 .Sh STANDARDS The .Fn stat From owner-svn-src-stable-8@FreeBSD.ORG Mon Jul 15 09:02:58 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 83457D8E; Mon, 15 Jul 2013 09:02:58 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7509D9D7; Mon, 15 Jul 2013 09:02:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6F92w8N017759; Mon, 15 Jul 2013 09:02:58 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6F92wip017757; Mon, 15 Jul 2013 09:02:58 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201307150902.r6F92wip017757@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Mon, 15 Jul 2013 09:02:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253358 - in stable/8: tools/build/mk usr.sbin/authpf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 09:02:58 -0000 Author: des Date: Mon Jul 15 09:02:57 2013 New Revision: 253358 URL: http://svnweb.freebsd.org/changeset/base/253358 Log: MFH (r253138,r253258): install authpf-noip Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc stable/8/usr.sbin/authpf/Makefile Directory Properties: stable/8/tools/build/ (props changed) stable/8/tools/build/mk/ (props changed) stable/8/usr.sbin/authpf/ (props changed) Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 15 08:48:45 2013 (r253357) +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 15 09:02:57 2013 (r253358) @@ -31,9 +31,12 @@ OLD_FILES+=usr/share/man/man8/audit.8.gz OLD_FILES+=usr/share/man/man8/auditd.8.gz .endif -#.if ${MK_AUTHPF} == no -# to be filled in -#.endif +.if ${MK_AUTHPF} == no +OLD_FILES+=usr/sbin/authpf +OLD_FILES+=usr/sbin/authpf-noip +OLD_FILES+=usr/share/man/man8/authpf.8.gz +OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz +.endif .if ${MK_BIND} == no OLD_FILES+=usr/bin/dig Modified: stable/8/usr.sbin/authpf/Makefile ============================================================================== --- stable/8/usr.sbin/authpf/Makefile Mon Jul 15 08:48:45 2013 (r253357) +++ stable/8/usr.sbin/authpf/Makefile Mon Jul 15 09:02:57 2013 (r253358) @@ -19,4 +19,7 @@ CFLAGS+= -DENABLE_ALTQ LDADD+= -lm -lmd -lutil DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL} +LINKS= ${BINDIR}/authpf ${BINDIR}/authpf-noip +MLINKS= authpf.8 authpf-noip.8 + .include From owner-svn-src-stable-8@FreeBSD.ORG Mon Jul 15 15:00:18 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 340FCE6; Mon, 15 Jul 2013 15:00:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 25DF616C; Mon, 15 Jul 2013 15:00:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FF0I8e036449; Mon, 15 Jul 2013 15:00:18 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6FF0Ivh036448; Mon, 15 Jul 2013 15:00:18 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201307151500.r6FF0Ivh036448@svn.freebsd.org> From: Glen Barber Date: Mon, 15 Jul 2013 15:00:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253364 - stable/8/share/man/man5 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 15:00:18 -0000 Author: gjb Date: Mon Jul 15 15:00:17 2013 New Revision: 253364 URL: http://svnweb.freebsd.org/changeset/base/253364 Log: MFC r253290: Document that a literal jail name of 0 (zero) is not allowed. PR: 174436 Modified: stable/8/share/man/man5/rc.conf.5 Directory Properties: stable/8/share/man/man5/ (props changed) Modified: stable/8/share/man/man5/rc.conf.5 ============================================================================== --- stable/8/share/man/man5/rc.conf.5 Mon Jul 15 14:59:45 2013 (r253363) +++ stable/8/share/man/man5/rc.conf.5 Mon Jul 15 15:00:17 2013 (r253364) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 22, 2012 +.Dd July 12, 2013 .Dt RC.CONF 5 .Os .Sh NAME @@ -3502,6 +3502,11 @@ configure multiple jails. The names specified in this list will be used to identify settings common to an instance of a jail, and should contain alphanumeric characters only. +The literal jail name of +.Dq Li 0 +.Pq zero +is not allowed. +.Pp Assuming that the jail in question was named .Li vjail , you would have the following dependent variables: From owner-svn-src-stable-8@FreeBSD.ORG Tue Jul 16 07:28:38 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 92F44FCD; Tue, 16 Jul 2013 07:28:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 867DF2F0; Tue, 16 Jul 2013 07:28:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6G7ScwY045921; Tue, 16 Jul 2013 07:28:38 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6G7ScoE045920; Tue, 16 Jul 2013 07:28:38 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307160728.r6G7ScoE045920@svn.freebsd.org> From: Andriy Gapon Date: Tue, 16 Jul 2013 07:28:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253381 - stable/8/sys/kern X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2013 07:28:38 -0000 Author: avg Date: Tue Jul 16 07:28:38 2013 New Revision: 253381 URL: http://svnweb.freebsd.org/changeset/base/253381 Log: MFC r253075: namecache sdt: freebsd doesn't support structured characters yet Modified: stable/8/sys/kern/vfs_cache.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) Modified: stable/8/sys/kern/vfs_cache.c ============================================================================== --- stable/8/sys/kern/vfs_cache.c Tue Jul 16 07:26:46 2013 (r253380) +++ stable/8/sys/kern/vfs_cache.c Tue Jul 16 07:28:38 2013 (r253381) @@ -67,10 +67,10 @@ SDT_PROBE_DEFINE2(vfs, namecache, enter_ "char *"); SDT_PROBE_DEFINE1(vfs, namecache, fullpath, entry, entry, "struct vnode *"); SDT_PROBE_DEFINE3(vfs, namecache, fullpath, hit, hit, "struct vnode *", - "struct char *", "struct vnode *"); + "char *", "struct vnode *"); SDT_PROBE_DEFINE1(vfs, namecache, fullpath, miss, miss, "struct vnode *"); SDT_PROBE_DEFINE3(vfs, namecache, fullpath, return, return, "int", - "struct vnode *", "struct char *"); + "struct vnode *", "char *"); SDT_PROBE_DEFINE3(vfs, namecache, lookup, hit, hit, "struct vnode *", "char *", "struct vnode *"); SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit_negative, hit-negative, From owner-svn-src-stable-8@FreeBSD.ORG Tue Jul 16 10:43:45 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 799913DA; Tue, 16 Jul 2013 10:43:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6B067CF8; Tue, 16 Jul 2013 10:43:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6GAhjpw004648; Tue, 16 Jul 2013 10:43:45 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6GAhjVb004647; Tue, 16 Jul 2013 10:43:45 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307161043.r6GAhjVb004647@svn.freebsd.org> From: Andriy Gapon Date: Tue, 16 Jul 2013 10:43:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253387 - stable/8/sys/security/audit X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2013 10:43:45 -0000 Author: avg Date: Tue Jul 16 10:43:44 2013 New Revision: 253387 URL: http://svnweb.freebsd.org/changeset/base/253387 Log: MFC r253078: audit_proc_coredump: check return value of audit_new Modified: stable/8/sys/security/audit/audit.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/security/ (props changed) Modified: stable/8/sys/security/audit/audit.c ============================================================================== --- stable/8/sys/security/audit/audit.c Tue Jul 16 09:40:59 2013 (r253386) +++ stable/8/sys/security/audit/audit.c Tue Jul 16 10:43:44 2013 (r253387) @@ -686,6 +686,8 @@ audit_proc_coredump(struct thread *td, c * (signal) tokens. */ ar = audit_new(AUE_CORE, td); + if (ar == NULL) + return; if (path != NULL) { pathp = &ar->k_ar.ar_arg_upath1; *pathp = malloc(MAXPATHLEN, M_AUDITPATH, M_WAITOK); From owner-svn-src-stable-8@FreeBSD.ORG Tue Jul 16 11:54:26 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5B34353A; Tue, 16 Jul 2013 11:54:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4CF30D1; Tue, 16 Jul 2013 11:54:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6GBsPho025457; Tue, 16 Jul 2013 11:54:25 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6GBsP1q025456; Tue, 16 Jul 2013 11:54:25 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307161154.r6GBsP1q025456@svn.freebsd.org> From: Andriy Gapon Date: Tue, 16 Jul 2013 11:54:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253389 - stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2013 11:54:26 -0000 Author: avg Date: Tue Jul 16 11:54:25 2013 New Revision: 253389 URL: http://svnweb.freebsd.org/changeset/base/253389 Log: MFC r253079: dtrace/fasttrap: install hook functions only after all data is initialized Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Jul 16 11:15:05 2013 (r253388) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Jul 16 11:54:25 2013 (r253389) @@ -2274,13 +2274,6 @@ fasttrap_load(void) mutex_init(&fasttrap_count_mtx, "fasttrap count mtx", MUTEX_DEFAULT, NULL); - /* - * Install our hooks into fork(2), exec(2), and exit(2). - */ - dtrace_fasttrap_fork = &fasttrap_fork; - dtrace_fasttrap_exit = &fasttrap_exec_exit; - dtrace_fasttrap_exec = &fasttrap_exec_exit; - #if defined(sun) fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-max-probes", FASTTRAP_MAX_DEFAULT); @@ -2357,6 +2350,13 @@ fasttrap_load(void) } #endif + /* + * Install our hooks into fork(2), exec(2), and exit(2). + */ + dtrace_fasttrap_fork = &fasttrap_fork; + dtrace_fasttrap_exit = &fasttrap_exec_exit; + dtrace_fasttrap_exec = &fasttrap_exec_exit; + (void) dtrace_meta_register("fasttrap", &fasttrap_mops, NULL, &fasttrap_meta_id); From owner-svn-src-stable-8@FreeBSD.ORG Wed Jul 17 10:53:12 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5E8022A1; Wed, 17 Jul 2013 10:53:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 50B48903; Wed, 17 Jul 2013 10:53:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HArCTZ046875; Wed, 17 Jul 2013 10:53:12 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HArCHj046874; Wed, 17 Jul 2013 10:53:12 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201307171053.r6HArCHj046874@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 17 Jul 2013 10:53:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253416 - stable/8/sys/geom/journal X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 10:53:12 -0000 Author: kib Date: Wed Jul 17 10:53:11 2013 New Revision: 253416 URL: http://svnweb.freebsd.org/changeset/base/253416 Log: MFC r253141: When panicing due to the gjournal overflow, print the geom metadata journal id. Modified: stable/8/sys/geom/journal/g_journal.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/geom/ (props changed) Modified: stable/8/sys/geom/journal/g_journal.c ============================================================================== --- stable/8/sys/geom/journal/g_journal.c Wed Jul 17 10:35:57 2013 (r253415) +++ stable/8/sys/geom/journal/g_journal.c Wed Jul 17 10:53:11 2013 (r253416) @@ -339,7 +339,9 @@ g_journal_check_overflow(struct g_journa (sc->sc_active.jj_offset > sc->sc_inactive.jj_offset && sc->sc_journal_offset >= sc->sc_inactive.jj_offset && sc->sc_journal_offset < sc->sc_active.jj_offset)) { - panic("Journal overflow (joffset=%jd active=%jd inactive=%jd)", + panic("Journal overflow " + "(id = %u joffset=%jd active=%jd inactive=%jd)", + (unsigned)sc->sc_id, (intmax_t)sc->sc_journal_offset, (intmax_t)sc->sc_active.jj_offset, (intmax_t)sc->sc_inactive.jj_offset); From owner-svn-src-stable-8@FreeBSD.ORG Wed Jul 17 14:05:36 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9298EA65; Wed, 17 Jul 2013 14:05:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6AEBE1A8; Wed, 17 Jul 2013 14:05:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HE5aOi005344; Wed, 17 Jul 2013 14:05:36 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HE5aSg005341; Wed, 17 Jul 2013 14:05:36 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201307171405.r6HE5aSg005341@svn.freebsd.org> From: John Baldwin Date: Wed, 17 Jul 2013 14:05:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253428 - stable/8/sys/dev/acpica X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 14:05:36 -0000 Author: jhb Date: Wed Jul 17 14:05:35 2013 New Revision: 253428 URL: http://svnweb.freebsd.org/changeset/base/253428 Log: MFC 252576: Don't perform the acpi_DeviceIsPresent() check for PCI-PCI bridges. If we are probing a PCI-PCI bridge it is because we found one by enumerating the devices on a PCI bus, so the bridge is definitely present. A few BIOSes report incorrect status (_STA) for some bridges that claimed they were not present when in fact they were. While here, move this check earlier for Host-PCI bridges so attach fails before doing any work that needs to be torn down. PR: kern/91594 Modified: stable/8/sys/dev/acpica/acpi_pcib.c stable/8/sys/dev/acpica/acpi_pcib_acpi.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/acpica/ (props changed) Modified: stable/8/sys/dev/acpica/acpi_pcib.c ============================================================================== --- stable/8/sys/dev/acpica/acpi_pcib.c Wed Jul 17 14:05:20 2013 (r253427) +++ stable/8/sys/dev/acpica/acpi_pcib.c Wed Jul 17 14:05:35 2013 (r253428) @@ -134,15 +134,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFF ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* - * Don't attach if we're not really there. - * - * XXX: This isn't entirely correct since we may be a PCI bus - * on a hot-plug docking station, etc. - */ - if (!acpi_DeviceIsPresent(dev)) - return_VALUE(ENXIO); - - /* * Get the PCI interrupt routing table for this bus. If we can't * get it, this is not an error but may reduce functionality. There * are several valid bridges in the field that do not have a _PRT, so Modified: stable/8/sys/dev/acpica/acpi_pcib_acpi.c ============================================================================== --- stable/8/sys/dev/acpica/acpi_pcib_acpi.c Wed Jul 17 14:05:20 2013 (r253427) +++ stable/8/sys/dev/acpica/acpi_pcib_acpi.c Wed Jul 17 14:05:35 2013 (r253428) @@ -164,6 +164,12 @@ acpi_pcib_acpi_attach(device_t dev) sc->ap_handle = acpi_get_handle(dev); /* + * Don't attach if we're not really there. + */ + if (!acpi_DeviceIsPresent(dev)) + return (ENXIO); + + /* * Get our segment number by evaluating _SEG. * It's OK for this to not exist. */ @@ -214,7 +220,7 @@ acpi_pcib_acpi_attach(device_t dev) if (status != AE_NOT_FOUND) { device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); - return_VALUE (ENXIO); + return (ENXIO); } else { /* If it's not found, assume 0. */ sc->ap_bus = 0;