From owner-p4-projects@FreeBSD.ORG Sat Jul 26 01:34:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8F6B37B404; Sat, 26 Jul 2003 01:34:20 -0700 (PDT) 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 37D6337B401 for ; Sat, 26 Jul 2003 01:34:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 404D443F3F for ; Sat, 26 Jul 2003 01:34:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6Q8YJ0U017775 for ; Sat, 26 Jul 2003 01:34:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6Q8YILI017772 for perforce@freebsd.org; Sat, 26 Jul 2003 01:34:18 -0700 (PDT) Date: Sat, 26 Jul 2003 01:34:18 -0700 (PDT) Message-Id: <200307260834.h6Q8YILI017772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 35033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jul 2003 08:34:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=35033 Change 35033 by marcel@marcel_nfs on 2003/07/26 01:33:34 IFC @35031 Affected files ... .. //depot/projects/uart/coda/coda_fbsd.c#2 integrate .. //depot/projects/uart/coda/coda_vnops.c#2 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#3 integrate .. //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/uart/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/uart/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/uart/ia64/include/setjmp.h#3 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/uart/kern/kern_exec.c#2 integrate .. //depot/projects/uart/kern/uipc_socket2.c#2 integrate .. //depot/projects/uart/kern/vfs_export.c#2 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#3 integrate .. //depot/projects/uart/kern/vfs_vnops.c#2 integrate .. //depot/projects/uart/kern/vnode_if.src#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/uart/vm/swap_pager.c#4 integrate Differences ... ==== //depot/projects/uart/coda/coda_fbsd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.30 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $"); #include "vcoda.h" @@ -127,7 +127,7 @@ if (cfvp == NULL) { opened_internally = 1; - error = VOP_OPEN(vp, FREAD, cred, p); + error = VOP_OPEN(vp, FREAD, cred, p, -1); printf("coda_getp: Internally Opening %p\n", vp); if (error) { ==== //depot/projects/uart/coda/coda_vnops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.49 2003/06/15 18:45:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.50 2003/07/26 07:32:20 phk Exp $"); #include #include @@ -296,7 +296,7 @@ cp->c_inode = inode; /* Open the cache file. */ - error = VOP_OPEN(vp, flag, cred, td); + error = VOP_OPEN(vp, flag, cred, td, -1); if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); @@ -467,7 +467,7 @@ opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), - cred, td); + cred, td, -1); printf("coda_rdwr: Internally Opening %p\n", vp); if (error) { printf("coda_rdwr: VOP_OPEN on container failed %d\n", error); @@ -1646,7 +1646,7 @@ if (cp->c_ovp == NULL) { opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); - error = VOP_OPEN(vp, FREAD, cred, td); + error = VOP_OPEN(vp, FREAD, cred, td, -1); printf("coda_readdir: Internally Opening %p\n", vp); if (error) { printf("coda_readdir: VOP_OPEN on container failed %d\n", error); ==== //depot/projects/uart/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.145 2003/07/18 10:26:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.146 2003/07/26 07:32:20 phk Exp $"); #include "opt_mac.h" @@ -310,7 +310,7 @@ if (error) goto cleanup; #endif - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); if (error) goto cleanup; ==== //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.18 2003/04/01 15:06:24 phk Exp $ + * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.19 2003/07/26 07:32:20 phk Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.105 2001/04/05 02:48:51 oster Exp $ */ @@ -2333,7 +2333,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { vput(vp); @@ -2364,7 +2364,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { continue; @@ -2419,7 +2419,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { /* Whatever... */ ==== //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.34 2003/06/12 20:48:36 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.35 2003/07/26 07:32:20 phk Exp $ */ @@ -243,7 +243,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.103 2003/06/29 03:05:59 tjr Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.104 2003/07/26 07:32:20 phk Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -324,9 +324,9 @@ * we don't VOP_OPEN the device again in that case. */ #ifdef notyet - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); #else - error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1); #endif VOP_UNLOCK(devvp, 0, td); if (error) ==== //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.55 2003/07/26 02:21:49 tjr Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.56 2003/07/26 07:32:21 phk Exp $ */ @@ -299,7 +299,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/fs/nwfs/nwfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.28 2003/06/19 03:08:10 alc Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.29 2003/07/26 07:32:21 phk Exp $ * */ #include @@ -528,7 +528,7 @@ #ifndef NWFS_RWCACHE td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ - VOP_OPEN(vp, FWRITE, cred, td); + VOP_OPEN(vp, FWRITE, cred, td, -1); error = vop_stdputpages(ap); VOP_CLOSE(vp, FWRITE, cred, td); return error; @@ -545,7 +545,7 @@ td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ -/* VOP_OPEN(vp, FWRITE, cred, td);*/ +/* VOP_OPEN(vp, FWRITE, cred, td, -1);*/ np = VTONW(vp); nmp = VFSTONWFS(vp->v_mount); pages = ap->a_m; ==== //depot/projects/uart/fs/smbfs/smbfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.21 2003/06/19 03:38:05 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.22 2003/07/26 07:32:21 phk Exp $ * */ #include @@ -594,7 +594,7 @@ #ifdef SMBFS_RWGENERIC td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ - VOP_OPEN(vp, FWRITE, cred, td); + VOP_OPEN(vp, FWRITE, cred, td, -1); error = vop_stdputpages(ap); VOP_CLOSE(vp, FWRITE, cred, td); return error; @@ -612,7 +612,7 @@ td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ -/* VOP_OPEN(vp, FWRITE, cred, td);*/ +/* VOP_OPEN(vp, FWRITE, cred, td, -1);*/ np = VTOSMB(vp); smp = VFSTOSMBFS(vp->v_mount); pages = ap->a_m; ==== //depot/projects/uart/fs/smbfs/smbfs_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.38 2003/06/17 12:58:02 tjr Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.39 2003/07/26 07:32:21 phk Exp $ */ #include #include @@ -380,7 +380,7 @@ */ if ((np->n_flag & NOPEN) == 0) { if (vcp->vc_flags & SMBV_WIN95) { - error = VOP_OPEN(vp, FWRITE, ap->a_cred, ap->a_td); + error = VOP_OPEN(vp, FWRITE, ap->a_cred, ap->a_td, -1); if (!error) { /* error = smbfs_smb_setfattrNT(np, 0, mtime, atime, &scred); VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_td);*/ ==== //depot/projects/uart/fs/udf/udf_vfsops.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.13 2003/06/12 20:48:37 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.14 2003/07/26 07:32:21 phk Exp $ */ /* udf_vfsops.c */ @@ -305,7 +305,7 @@ return (error); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, FREAD, FSCRED, td); + error = VOP_OPEN(devvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return error; ==== //depot/projects/uart/fs/unionfs/union_subr.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.74 2003/06/22 08:41:41 phk Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.75 2003/07/26 07:32:21 phk Exp $ */ #include @@ -784,7 +784,7 @@ * from VOP_CLOSE() */ vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(lvp, FREAD, cred, td); + error = VOP_OPEN(lvp, FREAD, cred, td, -1); if (error == 0 && vn_canvmio(lvp) == TRUE) error = vfs_object_create(lvp, td, cred); if (error == 0) { @@ -815,7 +815,7 @@ for (i = 0; i < un->un_openl; i++) { (void) VOP_CLOSE(lvp, FREAD, cred, td); - (void) VOP_OPEN(uvp, FREAD, cred, td); + (void) VOP_OPEN(uvp, FREAD, cred, td, -1); } if (un->un_openl) { if (vn_canvmio(uvp) == TRUE) @@ -1130,7 +1130,7 @@ if (error) return (error); - error = VOP_OPEN(vp, fmode, cred, td); + error = VOP_OPEN(vp, fmode, cred, td, -1); if (error == 0 && vn_canvmio(vp) == TRUE) error = vfs_object_create(vp, td, cred); if (error) { @@ -1340,7 +1340,7 @@ } if (lvp != NULLVP) { - error = VOP_OPEN(lvp, FREAD, fp->f_cred, td); + error = VOP_OPEN(lvp, FREAD, fp->f_cred, td, -1); if (error == 0 && vn_canvmio(lvp) == TRUE) error = vfs_object_create(lvp, td, fp->f_cred); if (error) { ==== //depot/projects/uart/fs/unionfs/union_vnops.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.101 2003/06/15 18:52:58 phk Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.102 2003/07/26 07:32:21 phk Exp $ */ #include @@ -776,7 +776,7 @@ */ if (error == 0) - error = VOP_OPEN(tvp, mode, cred, td); + error = VOP_OPEN(tvp, mode, cred, td, -1); /* * This is absolutely necessary or UFS will blow up. ==== //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.105 2003/06/12 20:48:38 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.106 2003/07/26 07:32:21 phk Exp $ */ #include @@ -649,7 +649,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/i386/ibcs2/imgact_coff.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.59 2003/06/02 06:48:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.60 2003/07/26 07:32:21 phk Exp $"); #include #include @@ -200,7 +200,7 @@ if ((error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td)) != 0) goto fail; - if ((error = VOP_OPEN(vp, FREAD, td->td_ucred, td)) != 0) + if ((error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1)) != 0) goto fail; /* ==== //depot/projects/uart/ia64/include/acpica_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.1 2002/07/30 19:35:31 iwasaki Exp $ + * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.2 2003/07/26 07:23:25 marcel Exp $ */ /****************************************************************************** @@ -65,7 +65,7 @@ #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ + __asm__ volatile ("1: ld4 r29=[%1]\n" \ ";;\n" \ "mov ar.ccv=r29\n" \ "mov r2=r29\n" \ @@ -77,7 +77,7 @@ ";;\n" \ "add r29=r29,r30\n" \ ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ + "cmpxchg4.acq r30=[%1],r29,ar.ccv\n" \ ";;\n" \ "cmp.eq p6,p7=r2,r30\n" \ "(p7) br.dpnt.few 1b\n" \ @@ -85,24 +85,24 @@ ";;\n" \ "(p8) mov %0=-1\n" \ "(p9) mov %0=r0\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ + :"=r"(Acq):"r"(GLptr):"r2","r29","r30","memory"); \ } while (0) #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ + __asm__ volatile ("1: ld4 r29=[%1]\n" \ ";;\n" \ "mov ar.ccv=r29\n" \ "mov r2=r29\n" \ "and r29=-4,r29\n" \ ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ + "cmpxchg4.acq r30=[%1],r29,ar.ccv\n" \ ";;\n" \ "cmp.eq p6,p7=r2,r30\n" \ "(p7) br.dpnt.few 1b\n" \ "and %0=1,r2\n" \ ";;\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ + :"=r"(Acq):"r"(GLptr):"r2","r29","r30","memory"); \ } while (0) /*! [End] no source code translation !*/ ==== //depot/projects/uart/ia64/include/setjmp.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.11 2003/07/25 22:36:48 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.12 2003/07/26 08:03:43 marcel Exp $ */ #ifndef _MACHINE_SETJMP_H_ @@ -90,11 +90,7 @@ #define J_SIGSET 0x1e0 #endif /* __BSD_VISIBLE */ -/* - * We only have 16 bytes left for future use, but it's a nice round, - * but above all large number. Size is in bytes. - */ -#define _JMPBUFSZ 0x200 +#define _JBLEN 0x20 /* Size in long doubles */ /* * XXX this check is wrong, since LOCORE is in the application namespace and @@ -113,16 +109,22 @@ */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE struct _sigjmp_buf { - char _Buffer[_JMPBUFSZ]; -} __aligned(16); + long double buf[_JBLEN]; +}; typedef struct _sigjmp_buf sigjmp_buf[1]; #endif struct _jmp_buf { - char _Buffer[_JMPBUFSZ]; -} __aligned(16); + long double buf[_JBLEN]; +}; typedef struct _jmp_buf jmp_buf[1]; +#ifdef _KERNEL +#ifdef CTASSERT +CTASSERT(sizeof(struct _jmp_buf) == 512); +#endif +#endif + #endif /* !LOCORE */ #endif /* !_MACHINE_SETJMP_H_ */ ==== //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.111 2003/06/12 20:48:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.112 2003/07/26 07:32:22 phk Exp $"); #include #include @@ -154,7 +154,7 @@ args.flags = ISOFSMNT_ROOT; vn_lock(rootvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(rootvp, FREAD, FSCRED, td); + error = VOP_OPEN(rootvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(rootvp, 0, td); if (error) return error; @@ -304,7 +304,7 @@ return (error); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, FREAD, FSCRED, td); + error = VOP_OPEN(devvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return error; ==== //depot/projects/uart/kern/kern_exec.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.224 2003/06/15 00:31:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.225 2003/07/26 07:32:22 phk Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -1142,7 +1142,7 @@ * Call filesystem specific open routine (which does nothing in the * general case). */ - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); return (error); } ==== //depot/projects/uart/kern/uipc_socket2.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.113 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.114 2003/07/26 07:23:24 scottl Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -626,8 +626,10 @@ space += m_length(control, &n); if (space > sbspace(sb)) return (0); +#if MSIZE <= 256 if (asa->sa_len > MLEN) return (0); +#endif MGET(m, M_DONTWAIT, MT_SONAME); if (m == 0) return (0); ==== //depot/projects/uart/kern/vfs_export.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.323 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.324 2003/07/26 07:23:24 scottl Exp $"); #include #include @@ -120,8 +120,10 @@ return (0); } +#if MSIZE <= 256 if (argp->ex_addrlen > MLEN) return (EINVAL); +#endif i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); ==== //depot/projects/uart/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.324 2003/07/04 12:20:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.325 2003/07/26 07:32:22 phk Exp $"); /* For 4.3 integer FS ID compatibility */ #include "opt_compat.h" @@ -3621,7 +3621,7 @@ if (error) goto bad; } - error = VOP_OPEN(vp, fmode, td->td_ucred, td); + error = VOP_OPEN(vp, fmode, td->td_ucred, td, -1); if (error) goto bad; /* ==== //depot/projects/uart/kern/vfs_vnops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.190 2003/06/22 23:03:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.191 2003/07/26 07:32:22 phk Exp $"); #include "opt_mac.h" @@ -234,7 +234,7 @@ vp->v_cachedfs = vap->va_fsid; vp->v_cachedid = vap->va_fileid; } - if ((error = VOP_OPEN(vp, fmode, cred, td)) != 0) + if ((error = VOP_OPEN(vp, fmode, cred, td, -1)) != 0) goto bad; /* * Make sure that a VM object is created for VMIO support. ==== //depot/projects/uart/kern/vnode_if.src#2 (text+ko) ==== @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.63 2003/06/22 22:45:24 rwatson Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.64 2003/07/26 07:32:22 phk Exp $ # # @@ -135,6 +135,7 @@ IN int mode; IN struct ucred *cred; IN struct thread *td; + IN int fd; }; # ==== //depot/projects/uart/ufs/ffs/ffs_vfsops.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.214 2003/06/12 20:48:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.215 2003/07/26 07:32:22 phk Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -610,9 +610,9 @@ * XXX: start to avoid getting trashed later on. */ #ifdef notyet - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); #else - error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1); #endif VOP_UNLOCK(devvp, 0, td); if (error) ==== //depot/projects/uart/ufs/ufs/ufs_extattr.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.65 2003/06/11 06:34:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.66 2003/07/26 07:32:22 phk Exp $"); #include "opt_ufs.h" @@ -324,7 +324,7 @@ { int error; - error = VOP_OPEN(vp, FREAD|FWRITE, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD|FWRITE, td->td_ucred, td, -1); if (error) { printf("ufs_extattr_enable_with_open.VOP_OPEN(): failed " "with %d\n", error); ==== //depot/projects/uart/vm/swap_pager.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.210 2003/07/22 20:54:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.211 2003/07/26 07:32:23 phk Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -2493,7 +2493,7 @@ error = mac_check_system_swapon(td->td_ucred, vp); if (error == 0) #endif - error = VOP_OPEN(vp, FREAD | FWRITE, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD | FWRITE, td->td_ucred, td, -1); (void) VOP_UNLOCK(vp, 0, td); if (error) return (error);