Date: Tue, 18 Jul 2006 18:34:00 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 101866 for review Message-ID: <200607181834.k6IIY0Nb009428@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> -__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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607181834.k6IIY0Nb009428>