From owner-p4-projects@FreeBSD.ORG Tue Jul 18 18:34:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98F3316A4E5; Tue, 18 Jul 2006 18:34:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 742BA16A4E0 for ; Tue, 18 Jul 2006 18:34:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3998643D46 for ; Tue, 18 Jul 2006 18:34:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6IIY1HR009431 for ; Tue, 18 Jul 2006 18:34:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6IIY0Nb009428 for perforce@freebsd.org; Tue, 18 Jul 2006 18:34:00 GMT (envelope-from imp@freebsd.org) Date: Tue, 18 Jul 2006 18:34:00 GMT Message-Id: <200607181834.k6IIY0Nb009428@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 101866 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: Tue, 18 Jul 2006 18:34:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=101866 Change 101866 by imp@imp_harmony on 2006/07/18 18:33:46 IFC Affected files ... .. //depot/projects/arm/src/sys/conf/options#26 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#5 integrate Differences ... ==== //depot/projects/arm/src/sys/conf/options#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.553 2006/07/17 09:07:01 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.554 2006/07/18 17:00:51 imp Exp $ # # On the handling of kernel options # @@ -208,6 +208,7 @@ # filesystems will be enabled - but look below. NFSCLIENT opt_nfs.h NFSSERVER opt_nfs.h +NFS4CLIENT opt_nfs.h # filesystems and libiconv bridge CD9660_ICONV opt_dontuse.h ==== //depot/projects/arm/src/sys/sys/sysctl.h#9 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.141 2006/06/10 14:34:07 rwatson Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.142 2006/07/18 17:00:51 imp Exp $ */ #ifndef _SYS_SYSCTL_H_ ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.139 2006/03/02 05:50:23 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.140 2006/07/18 07:03:43 stefanf Exp $"); #include "opt_quota.h" @@ -2131,13 +2131,13 @@ blksfree = cg_blksfree(cgp); len = howmany(fs->fs_fpg, NBBY) - start; loc = scanc((u_int)len, (u_char *)&blksfree[start], - (u_char *)fragtbl[fs->fs_frag], + fragtbl[fs->fs_frag], (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); if (loc == 0) { len = start + 1; start = 0; loc = scanc((u_int)len, (u_char *)&blksfree[0], - (u_char *)fragtbl[fs->fs_frag], + fragtbl[fs->fs_frag], (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); if (loc == 0) { printf("start = %d, len = %d, fs = %s\n",