Date: Tue, 6 Apr 2004 20:57:39 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50560 for review Message-ID: <200404070357.i373vdiG072051@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50560 Change 50560 by rwatson@rwatson_tislabs on 2004/04/06 20:56:54 - More clause three removal. Affected files ... .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_tables.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/dir.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_ihash.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufsmount.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#3 (text+ko) ==== @@ -19,10 +19,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -43,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.117 2004/03/16 22:06:32 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.118 2004/04/07 03:47:20 imp Exp $"); #include "opt_quota.h" ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_balloc.c#2 (text+ko) ==== @@ -19,10 +19,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -43,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.43 2003/08/15 20:03:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.44 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.55 2003/02/22 00:29:50 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.56 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_FFS_EXTERN_H ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_inode.c#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.91 2003/10/18 14:10:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.92 2004/04/07 03:47:20 imp Exp $"); #include "opt_quota.h" ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_subr.c#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.37 2003/06/11 06:31:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.38 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_tables.c#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_tables.c,v 1.10 2003/06/11 06:31:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_tables.c,v 1.11 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <ufs/ufs/dinode.h> ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#3 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.229 2004/02/14 04:41:13 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.230 2004/04/07 03:47:20 imp Exp $"); #include "opt_mac.h" #include "opt_quota.h" ==== //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#3 (text+ko) ==== @@ -19,10 +19,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -43,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.127 2004/02/11 15:27:26 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.128 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <sys/bio.h> ==== //depot/projects/netperf_socket/sys/ufs/ffs/fs.h#3 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.13 (Berkeley) 3/21/95 - * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.41 2004/04/03 23:30:59 mux Exp $ + * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.42 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_FFS_FS_H_ ==== //depot/projects/netperf_socket/sys/ufs/ufs/dir.h#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -36,7 +32,7 @@ * SUCH DAMAGE. * * @(#)dir.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/ufs/ufs/dir.h,v 1.9 1999/08/28 00:52:27 peter Exp $ + * $FreeBSD: src/sys/ufs/ufs/dir.h,v 1.10 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_UFS_DIR_H_ ==== //depot/projects/netperf_socket/sys/ufs/ufs/inode.h#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -36,7 +32,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.44 2003/08/15 20:03:19 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.45 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_UFS_INODE_H_ ==== //depot/projects/netperf_socket/sys/ufs/ufs/quota.h#2 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ * SUCH DAMAGE. * * @(#)quota.h 8.3 (Berkeley) 8/19/94 - * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.25 2003/06/15 06:36:19 rwatson Exp $ + * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.26 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_UFS_QUOTA_H_ ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_bmap.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -39,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.59 2003/10/18 14:10:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.60 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.10 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.48 2002/10/18 22:52:41 dillon Exp $ + * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.49 2004/04/07 03:47:20 imp Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_ihash.c#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.37 2003/10/04 14:03:28 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.38 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_inode.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -39,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.52 2003/10/05 02:45:00 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.53 2004/04/07 03:47:20 imp Exp $"); #include "opt_quota.h" #include "opt_ufs.h" ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_lookup.c#3 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -39,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.69 2004/03/11 18:02:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.70 2004/04/07 03:47:20 imp Exp $"); #include "opt_ffs_broken_fixme.h" #include "opt_ufs.h" ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_quota.c#2 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.70 2003/11/05 04:30:08 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.71 2004/04/07 03:47:20 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -39,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.37 2003/06/15 06:36:19 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.38 2004/04/07 03:47:20 imp Exp $"); #include "opt_quota.h" #include "opt_ufs.h" ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#4 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -39,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.238 2004/03/11 18:50:33 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.239 2004/04/07 03:47:20 imp Exp $"); #include "opt_mac.h" #include "opt_quota.h" ==== //depot/projects/netperf_socket/sys/ufs/ufs/ufsmount.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.28 2003/01/07 18:23:50 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.29 2004/04/07 03:47:21 imp Exp $ */ #ifndef _UFS_UFS_UFSMOUNT_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404070357.i373vdiG072051>