From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:42:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64941065673; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5679106567B for ; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 828408FC1A for ; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKgLEb039955 for ; Mon, 10 Mar 2008 20:42:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKgL3h039953 for perforce@freebsd.org; Mon, 10 Mar 2008 20:42:21 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 20:42:21 GMT Message-Id: <200803102042.m2AKgL3h039953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 137350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2008 20:42:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137350 Change 137350 by imp@imp_paco-paco on 2008/03/10 20:41:22 IFC @137347 Affected files ... .. //depot/projects/arm/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/arm/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/arm/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/arm/src/sbin/mount/mount.8#8 integrate .. //depot/projects/arm/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/arm/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 integrate Differences ... ==== //depot/projects/arm/src/sbin/mount/mount.8#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.84 2007/11/27 20:37:16 jhb Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.85 2008/03/10 19:03:55 tmclaugh Exp $ .\" -.Dd July 12, 2006 +.Dd March 10, 2008 .Dt MOUNT 8 .Os .Sh NAME @@ -335,7 +335,7 @@ .Nm command: .Bd -literal -offset indent -mount -t unionfs -o -b /sys $HOME/sys +mount -t unionfs -o below /sys $HOME/sys .Ed .Pp causes ==== //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.21 2008/03/01 11:04:04 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.22 2008/03/10 18:15:02 rwatson Exp $ */ #include @@ -170,9 +170,6 @@ * are limited to 1/sec. */ if (audit_qctrl.aq_minfree != 0) { - /* - * XXXAUDIT: Check math and block size calculations here. - */ temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) { if (ppsratecheck(&last_lowspace_trigger, ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.217 2008/02/24 16:38:58 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.218 2008/03/10 18:44:07 emaste Exp $"); /* * For now we want the safety net that the DEBUG flag provides. @@ -78,7 +78,6 @@ #include #include "opt_ffs.h" -#include "opt_quota.h" #ifndef SOFTUPDATES