Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/22f48a9cf731
branches: thorpej_scsipi
changeset: 477341:22f48a9cf731
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Dec 08 09:06:21 2000 +0000
description:
Sync with HEAD.
diffstat:
sys/adosfs/advnops.c | 31 +-
sys/coda/coda_subr.c | 12 +-
sys/coda/coda_vnops.c | 10 +-
sys/compat/aout/aout_exec.c | 10 +-
sys/compat/aout/aout_misc.c | 96 +-
sys/compat/aout/aout_syscall.h | 4 +-
sys/compat/aout/aout_syscallargs.h | 4 +-
sys/compat/aout/aout_syscalls.c | 4 +-
sys/compat/aout/aout_sysent.c | 6 +-
sys/compat/aout/aout_util.h | 58 -
sys/compat/aout/syscalls.master | 4 +-
sys/compat/common/Makefile.inc | 12 +-
sys/compat/common/compat_util.h | 10 +-
sys/compat/common/vfs_syscalls_43.c | 4 +-
sys/compat/freebsd/files.freebsd | 4 +-
sys/compat/freebsd/freebsd_exec.c | 160 +-
sys/compat/freebsd/freebsd_exec_aout.c | 89 +
sys/compat/freebsd/freebsd_exec_elf32.c | 129 +
sys/compat/freebsd/freebsd_file.c | 78 +-
sys/compat/freebsd/freebsd_ioctl.c | 4 +-
sys/compat/freebsd/freebsd_ipc.c | 4 +-
sys/compat/freebsd/freebsd_misc.c | 6 +-
sys/compat/freebsd/freebsd_ptrace.c | 4 +-
sys/compat/freebsd/freebsd_sysent.c | 4 +-
sys/compat/freebsd/freebsd_util.h | 88 -
sys/compat/freebsd/syscalls.master | 4 +-
sys/compat/hpux/files.hpux | 3 +-
sys/compat/hpux/hpux_compat.c | 14 +-
sys/compat/hpux/hpux_exec.c | 190 +-
sys/compat/hpux/hpux_exec.h | 5 +-
sys/compat/hpux/hpux_exec_aout.c | 277 ++
sys/compat/hpux/hpux_file.c | 40 +-
sys/compat/hpux/hpux_ipc.c | 4 +-
sys/compat/hpux/hpux_net.c | 4 +-
sys/compat/hpux/hpux_sysent.c | 4 +-
sys/compat/hpux/hpux_tty.c | 4 +-
sys/compat/hpux/hpux_util.h | 10 +-
sys/compat/hpux/syscalls.master | 4 +-
sys/compat/ibcs2/files.ibcs2 | 5 +-
sys/compat/ibcs2/ibcs2_exec.c | 904 +---------
sys/compat/ibcs2/ibcs2_exec_coff.c | 676 +++++++
sys/compat/ibcs2/ibcs2_exec_elf32.c | 143 +
sys/compat/ibcs2/ibcs2_exec_xout.c | 235 ++
sys/compat/ibcs2/ibcs2_fcntl.c | 12 +-
sys/compat/ibcs2/ibcs2_ipc.c | 5 +-
sys/compat/ibcs2/ibcs2_misc.c | 32 +-
sys/compat/ibcs2/ibcs2_stat.c | 10 +-
sys/compat/ibcs2/ibcs2_sysent.c | 4 +-
sys/compat/ibcs2/ibcs2_util.h | 16 +-
sys/compat/ibcs2/syscalls.master | 4 +-
sys/compat/linux/arch/alpha/linux_machdep.c | 6 +-
sys/compat/linux/arch/alpha/linux_machdep.h | 5 +-
sys/compat/linux/arch/alpha/linux_syscall.h | 12 +-
sys/compat/linux/arch/alpha/linux_syscallargs.h | 23 +-
sys/compat/linux/arch/alpha/linux_syscalls.c | 8 +-
sys/compat/linux/arch/alpha/linux_sysent.c | 18 +-
sys/compat/linux/arch/alpha/syscalls.master | 13 +-
sys/compat/linux/arch/i386/linux_machdep.c | 8 +-
sys/compat/linux/arch/i386/linux_machdep.h | 8 +-
sys/compat/linux/arch/i386/linux_syscall.h | 7 +-
sys/compat/linux/arch/i386/linux_syscallargs.h | 22 +-
sys/compat/linux/arch/i386/linux_syscalls.c | 6 +-
sys/compat/linux/arch/i386/linux_sysent.c | 18 +-
sys/compat/linux/arch/i386/syscalls.master | 10 +-
sys/compat/linux/arch/m68k/linux_syscall.h | 7 +-
sys/compat/linux/arch/m68k/linux_syscallargs.h | 28 +-
sys/compat/linux/arch/m68k/linux_syscalls.c | 14 +-
sys/compat/linux/arch/m68k/linux_sysent.c | 28 +-
sys/compat/linux/arch/m68k/syscalls.master | 18 +-
sys/compat/linux/common/linux_exec.c | 17 +-
sys/compat/linux/common/linux_exec_aout.c | 104 +-
sys/compat/linux/common/linux_exec_elf32.c | 5 +-
sys/compat/linux/common/linux_file.c | 38 +-
sys/compat/linux/common/linux_ioctl.c | 4 +-
sys/compat/linux/common/linux_ipc.c | 4 +-
sys/compat/linux/common/linux_misc.c | 69 +-
sys/compat/linux/common/linux_misc_notalpha.c | 4 +-
sys/compat/linux/common/linux_uselib.c | 165 +
sys/compat/linux/common/linux_util.h | 10 +-
sys/compat/linux/files.linux | 3 +-
sys/compat/netbsd32/files.netbsd32 | 5 +-
sys/compat/netbsd32/netbsd32.h | 9 +-
sys/compat/netbsd32/netbsd32_compat_09.c | 4 +-
sys/compat/netbsd32/netbsd32_compat_10.c | 4 +-
sys/compat/netbsd32/netbsd32_compat_12.c | 12 +-
sys/compat/netbsd32/netbsd32_compat_14.c | 8 +-
sys/compat/netbsd32/netbsd32_compat_43.c | 12 +-
sys/compat/netbsd32/netbsd32_exec.c | 451 ----
sys/compat/netbsd32/netbsd32_exec.h | 57 +-
sys/compat/netbsd32/netbsd32_exec_aout.c | 258 ++
sys/compat/netbsd32/netbsd32_exec_elf32.c | 162 +
sys/compat/netbsd32/netbsd32_ioctl.c | 16 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 187 +-
sys/compat/netbsd32/netbsd32_syscall.h | 3 +-
sys/compat/netbsd32/netbsd32_syscallargs.h | 5 +-
sys/compat/netbsd32/netbsd32_syscalls.c | 6 +-
sys/compat/netbsd32/netbsd32_sysent.c | 9 +-
sys/compat/netbsd32/syscalls.master | 8 +-
sys/compat/osf1/osf1_cvt.c | 4 +-
sys/compat/osf1/osf1_exec.c | 19 +-
sys/compat/osf1/osf1_exec.h | 6 +-
sys/compat/osf1/osf1_file.c | 26 +-
sys/compat/osf1/osf1_ioctl.c | 4 +-
sys/compat/osf1/osf1_misc.c | 10 +-
sys/compat/osf1/osf1_mount.c | 6 +-
sys/compat/osf1/osf1_signal.c | 4 +-
sys/compat/osf1/osf1_socket.c | 4 +-
sys/compat/osf1/osf1_sysent.c | 4 +-
sys/compat/osf1/osf1_util.h | 16 -
sys/compat/osf1/syscalls.master | 4 +-
sys/compat/pecoff/pecoff_exec.c | 13 +-
sys/compat/pecoff/pecoff_util.h | 10 +-
sys/compat/sunos/files.sunos | 3 +-
sys/compat/sunos/sunos_exec.c | 202 +--
sys/compat/sunos/sunos_exec.h | 4 +-
sys/compat/sunos/sunos_exec_aout.c | 228 ++
sys/compat/sunos/sunos_ioctl.c | 4 +-
sys/compat/sunos/sunos_misc.c | 26 +-
sys/compat/sunos/sunos_sysent.c | 4 +-
sys/compat/sunos/sunos_util.h | 79 -
sys/compat/sunos/syscalls.master | 4 +-
sys/compat/svr4/files.svr4 | 3 +-
sys/compat/svr4/svr4_exec.c | 73 +-
sys/compat/svr4/svr4_exec_elf32.c | 115 +
sys/compat/svr4/svr4_fcntl.c | 10 +-
sys/compat/svr4/svr4_ipc.c | 4 +-
sys/compat/svr4/svr4_misc.c | 12 +-
sys/compat/svr4/svr4_stat.c | 20 +-
sys/compat/svr4/svr4_sysent.c | 4 +-
sys/compat/svr4/svr4_util.h | 10 +-
sys/compat/svr4/syscalls.master | 4 +-
sys/compat/ultrix/syscalls.master | 5 +-
sys/compat/ultrix/ultrix_ioctl.c | 6 +-
sys/compat/ultrix/ultrix_misc.c | 7 +-
sys/compat/ultrix/ultrix_pathname.c | 25 +-
sys/compat/ultrix/ultrix_sysent.c | 4 +-
sys/compat/ultrix/ultrix_util.h | 79 -
sys/conf/files | 18 +-
sys/conf/osrelease.sh | 4 +-
sys/ddb/db_command.c | 30 +-
sys/ddb/db_command.h | 4 +-
sys/ddb/db_xxx.c | 20 +-
sys/dev/DEVNAMES | 7 +-
sys/dev/dec/dzkbd.c | 319 +++
sys/dev/dec/dzkbdvar.h | 17 +
sys/dev/dec/dzms.c | 263 ++
sys/dev/dec/wskbdmap_lk201.c | 4 +-
sys/dev/i2o/TODO | 31 +-
sys/dev/i2o/files.i2o | 6 +-
sys/dev/i2o/i2o.h | 219 +-
sys/dev/i2o/iop.c | 1410 +++++++++-----
sys/dev/i2o/iopsp.c | 198 +-
sys/dev/i2o/iopvar.h | 126 +-
sys/dev/i2o/ld_iop.c | 565 ++++++
sys/dev/i2o/lsu_iop.c | 470 -----
sys/dev/ic/ac97reg.h | 66 +-
sys/dev/ic/aic7xxx.c | 12 +-
sys/dev/ic/awi.c | 20 +-
sys/dev/ic/i82557.c | 14 +-
sys/dev/ic/isp_netbsd.c | 4 +-
sys/dev/ic/ld_cac.c | 198 ++
sys/dev/ic/lsu_cac.c | 198 --
sys/dev/ic/ncr53c9x.c | 658 +++++-
sys/dev/ic/ncr53c9xvar.h | 132 +-
sys/dev/ic/ne2000.c | 8 +-
sys/dev/ic/rtl81x9.c | 332 +-
sys/dev/ic/rtl81x9var.h | 11 +-
sys/dev/ic/tulip.c | 22 +-
sys/dev/ieee1394/fwohci.c | 36 +-
sys/dev/isa/ad1848var.h | 40 +-
sys/dev/isa/fd.c | 26 +-
sys/dev/isa/ym.c | 15 +-
sys/dev/ld.c | 632 ++++++
sys/dev/ldvar.h | 79 +
sys/dev/lsu.c | 569 ------
sys/dev/lsuvar.h | 77 -
sys/dev/pci/auich.c | 1123 +++++++++++
sys/dev/pci/auichreg.h | 119 +
sys/dev/pci/cs4280.c | 14 +-
sys/dev/pci/cy82c693.c | 6 +-
sys/dev/pci/files.pci | 11 +-
sys/dev/pci/fms.c | 6 +-
sys/dev/pci/iop_pci.c | 43 +-
sys/dev/pci/isp_pci.c | 3 +-
sys/dev/pci/ld_twe.c | 238 ++
sys/dev/pci/lsu_twe.c | 238 --
sys/dev/pci/neo.c | 22 +-
sys/dev/pci/pccbb.c | 95 +-
sys/dev/pci/pci_map.c | 53 +-
sys/dev/pci/pcidevs | 10 +-
sys/dev/pci/pcidevs.h | 12 +-
sys/dev/pci/pcidevs_data.h | 42 +-
sys/dev/pci/pciide.c | 17 +-
sys/dev/pci/siop_pci_common.c | 14 +-
sys/dev/raidframe/rf_disks.c | 4 +-
sys/dev/raidframe/rf_netbsdkintf.c | 4 +-
sys/dev/raidframe/rf_sstf.c | 4 +-
sys/dev/raidframe/rf_stripelocks.c | 4 +-
sys/dev/sbus/cgsix_sbus.c | 14 +-
sys/dev/sbus/esp_sbus.c | 64 +-
sys/dev/sbus/qec.c | 4 +-
sys/dev/scsipi/scsi_all.h | 4 +-
sys/dev/scsipi/scsiconf.c | 10 +-
sys/dev/scsipi/sd.c | 24 +-
sys/dev/scsipi/st.c | 106 +-
sys/dev/tc/files.tc | 40 +-
sys/dev/tc/sfb.c | 180 +-
sys/dev/tc/zs_ioasic.c | 22 +-
sys/dev/usb/if_kue.c | 3 +-
sys/dev/usb/ugen.c | 6 +-
sys/dev/usb/uhci.c | 22 +-
sys/dev/usb/ulpt.c | 27 +-
sys/dev/usb/usb_port.h | 3 +-
sys/dev/usb/usbdevs | 13 +-
sys/dev/usb/usbdevs.h | 15 +-
sys/dev/usb/usbdevs_data.h | 46 +-
sys/dev/vnd.c | 24 +-
sys/dev/wscons/wsdisplay.c | 18 +-
sys/dev/wscons/wsdisplay_usl_io.h | 7 +-
sys/dev/wscons/wsksymdef.h | 11 +-
sys/dev/wsfont/files.wsfont | 3 +-
sys/dev/wsfont/omron12x20.h | 2153 +++++++++++++++++++++++
sys/dev/wsfont/wsfont.c | 12 +-
sys/filecorefs/filecore_vfsops.c | 5 +-
sys/filecorefs/filecore_vnops.c | 30 +-
sys/isofs/cd9660/cd9660_vfsops.c | 4 +-
sys/isofs/cd9660/cd9660_vnops.c | 32 +-
sys/kern/exec_conf.c | 80 +-
sys/kern/exec_elf32.c | 6 +-
sys/kern/exec_subr.c | 3 +-
sys/kern/init_main.c | 8 +-
sys/kern/kern_exec.c | 32 +-
sys/kern/kern_fork.c | 4 +-
sys/kern/kern_lock.c | 83 +-
sys/kern/kern_malloc.c | 6 +-
sys/kern/kern_physio.c | 5 +-
sys/kern/kern_prot.c | 28 +-
sys/kern/kern_subr.c | 4 +-
sys/kern/makesyscalls.sh | 11 +-
sys/kern/subr_extent.c | 10 +-
sys/kern/subr_pool.c | 526 +++-
sys/kern/tty_conf.c | 5 +-
sys/kern/tty_pty.c | 5 +-
sys/kern/uipc_syscalls.c | 19 +-
sys/kern/vfs_bio.c | 89 +-
sys/kern/vfs_cache.c | 51 +-
sys/kern/vfs_cluster.c | 4 +-
sys/kern/vfs_subr.c | 136 +-
sys/kern/vfs_syscalls.c | 11 +-
sys/kern/vfs_vnops.c | 15 +-
sys/kern/vnode_if.c | 150 +-
sys/kern/vnode_if.src | 47 +-
sys/lib/libkern/Makefile.inc | 12 +-
sys/lib/libkern/arch/m68k/strcmp.S | 13 +-
sys/lib/libkern/arch/m68k/strncpy.S | 23 +-
sys/lib/libsa/Makefile.inc | 12 +-
sys/lib/libsa/cread.c | 4 +-
sys/lib/libsa/loadfile.c | 4 +-
sys/lib/libz/Makefile.inc | 12 +-
sys/lkm/TODO | 6 +-
sys/lkm/vfs/ufs/Makefile | 5 +-
sys/lkm/vfs/ufs/lfs/Makefile | 4 +-
sys/lkm/vfs/ufs/lfs/lkminit_lfs.c | 72 -
sys/lkm/vfs/ufs/lfs/lkminit_vfs.c | 180 +
sys/miscfs/genfs/genfs.h | 5 +-
sys/miscfs/genfs/genfs_vnops.c | 659 +++++++-
sys/miscfs/genfs/layer_subr.c | 3 +-
sys/miscfs/procfs/procfs.h | 3 +-
sys/miscfs/procfs/procfs_map.c | 30 +-
sys/miscfs/procfs/procfs_mem.c | 88 +-
sys/miscfs/procfs/procfs_subr.c | 7 +-
sys/miscfs/procfs/procfs_vnops.c | 6 +-
sys/miscfs/syncfs/sync_subr.c | 33 +-
273 files changed, 13971 insertions(+), 6799 deletions(-)
diffs (truncated from 31323 to 300 lines):
diff -r 82e6b5102d4e -r 22f48a9cf731 sys/adosfs/advnops.c
--- a/sys/adosfs/advnops.c Mon Nov 27 14:10:45 2000 +0000
+++ b/sys/adosfs/advnops.c Fri Dec 08 09:06:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.52.2.1 2000/11/20 18:08:02 bouyer Exp $ */
+/* $NetBSD: advnops.c,v 1.52.2.2 2000/12/08 09:06:21 bouyer Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -143,7 +143,9 @@
{ &vop_truncate_desc, adosfs_truncate }, /* truncate */
{ &vop_update_desc, adosfs_update }, /* update */
{ &vop_bwrite_desc, adosfs_bwrite }, /* bwrite */
- { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+ { &vop_getpages_desc, genfs_getpages }, /* getpages */
+ { &vop_size_desc, genfs_size }, /* size */
+ { NULL, NULL }
};
struct vnodeopv_desc adosfs_vnodeop_opv_desc =
@@ -226,6 +228,7 @@
int a_ioflag;
struct ucred *a_cred;
} */ *sp = v;
+ struct vnode *vp = sp->a_vp;
struct adosfsmount *amp;
struct anode *ap;
struct uio *uio;
@@ -265,6 +268,28 @@
/*
* taken from ufs_read()
*/
+
+ if (vp->v_type == VREG) {
+ error = 0;
+ while (uio->uio_resid > 0) {
+ void *win;
+ vsize_t bytelen = min(ap->fsize - uio->uio_offset,
+ uio->uio_resid);
+
+ if (bytelen == 0) {
+ break;
+ }
+ win = ubc_alloc(&vp->v_uvm.u_obj, uio->uio_offset,
+ &bytelen, UBC_READ);
+ error = uiomove(win, bytelen, uio);
+ ubc_release(win, 0);
+ if (error) {
+ break;
+ }
+ }
+ goto out;
+ }
+
do {
/*
* we are only supporting ADosFFS currently
@@ -326,6 +351,8 @@
amp->bsize - amp->dbsize, (int)n, uio);
brelse(bp);
} while (error == 0 && uio->uio_resid > 0 && n != 0);
+
+out:
reterr:
#ifdef ADOSFS_DIAGNOSTIC
printf(" %d)", error);
diff -r 82e6b5102d4e -r 22f48a9cf731 sys/coda/coda_subr.c
--- a/sys/coda/coda_subr.c Mon Nov 27 14:10:45 2000 +0000
+++ b/sys/coda/coda_subr.c Fri Dec 08 09:06:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_subr.c,v 1.8.2.1 2000/11/20 18:08:04 bouyer Exp $ */
+/* $NetBSD: coda_subr.c,v 1.8.2.2 2000/12/08 09:07:05 bouyer Exp $ */
/*
*
@@ -227,7 +227,7 @@
#endif
count++;
CODADEBUG(CODA_FLUSH,
- myprintf(("Live cnode fid %lx.%lx.%lx flags %d count %ld\n",
+ myprintf(("Live cnode fid %lx.%lx.%lx flags %d count %d\n",
(cp->c_fid).Volume,
(cp->c_fid).Vnode,
(cp->c_fid).Unique,
@@ -277,7 +277,7 @@
for (cp = coda_cache[hash];
cp != NULL;
cp = CNODE_NEXT(cp)) {
- myprintf(("Live cnode fid %lx.%lx.%lx count %ld\n",
+ myprintf(("Live cnode fid %lx.%lx.%lx count %d\n",
(cp->c_fid).Volume,(cp->c_fid).Vnode,
(cp->c_fid).Unique, CTOV(cp)->v_usecount));
}
@@ -424,7 +424,7 @@
if (CTOV(cp)->v_flag & VTEXT)
error = coda_vmflush(cp);
CODADEBUG(CODA_ZAPFILE, myprintf(("zapfile: fid = (%lx.%lx.%lx),
- refcnt = %ld, error = %d\n",
+ refcnt = %d, error = %d\n",
cp->c_fid.Volume,
cp->c_fid.Vnode,
cp->c_fid.Unique,
@@ -452,7 +452,7 @@
coda_nc_zapParentfid(&out->coda_zapdir.CodaFid, IS_DOWNCALL);
CODADEBUG(CODA_ZAPDIR, myprintf(("zapdir: fid = (%lx.%lx.%lx),
- refcnt = %ld\n",cp->c_fid.Volume,
+ refcnt = %d\n",cp->c_fid.Volume,
cp->c_fid.Vnode,
cp->c_fid.Unique,
CTOV(cp)->v_usecount - 1)););
@@ -486,7 +486,7 @@
error = coda_vmflush(cp);
}
- CODADEBUG(CODA_PURGEFID, myprintf(("purgefid: fid = (%lx.%lx.%lx), refcnt = %ld, error = %d\n",
+ CODADEBUG(CODA_PURGEFID, myprintf(("purgefid: fid = (%lx.%lx.%lx), refcnt = %d, error = %d\n",
cp->c_fid.Volume, cp->c_fid.Vnode,
cp->c_fid.Unique,
CTOV(cp)->v_usecount - 1, error)););
diff -r 82e6b5102d4e -r 22f48a9cf731 sys/coda/coda_vnops.c
--- a/sys/coda/coda_vnops.c Mon Nov 27 14:10:45 2000 +0000
+++ b/sys/coda/coda_vnops.c Fri Dec 08 09:06:21 2000 +0000
@@ -6,7 +6,7 @@
rmdir
symlink
*/
-/* $NetBSD: coda_vnops.c,v 1.15.2.1 2000/11/20 18:08:05 bouyer Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.15.2.2 2000/12/08 09:07:05 bouyer Exp $ */
/*
*
@@ -453,7 +453,7 @@
}
/* Have UFS handle the call. */
- CODADEBUG(CODA_RDWR, myprintf(("indirect rdwr: fid = (%lx.%lx.%lx), refcnt = %ld\n",
+ CODADEBUG(CODA_RDWR, myprintf(("indirect rdwr: fid = (%lx.%lx.%lx), refcnt = %d\n",
cp->c_fid.Volume, cp->c_fid.Vnode,
cp->c_fid.Unique, CTOV(cp)->v_usecount)); )
@@ -873,9 +873,9 @@
if (IS_UNMOUNTING(cp)) {
#ifdef DEBUG
- printf("coda_inactive: IS_UNMOUNTING use %ld: vp %p, cp %p\n", vp->v_usecount, vp, cp);
+ printf("coda_inactive: IS_UNMOUNTING use %d: vp %p, cp %p\n", vp->v_usecount, vp, cp);
if (cp->c_ovp != NULL)
- printf("coda_inactive: cp->ovp != NULL use %ld: vp %p, cp %p\n",
+ printf("coda_inactive: cp->ovp != NULL use %d: vp %p, cp %p\n",
vp->v_usecount, vp, cp);
#endif
lockmgr(&vp->v_lock, LK_RELEASE, &vp->v_interlock);
@@ -1727,7 +1727,7 @@
}
/* Have UFS handle the call. */
- CODADEBUG(CODA_READDIR, myprintf(("indirect readdir: fid = (%lx.%lx.%lx), refcnt = %ld\n",cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique, vp->v_usecount)); )
+ CODADEBUG(CODA_READDIR, myprintf(("indirect readdir: fid = (%lx.%lx.%lx), refcnt = %d\n",cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique, vp->v_usecount)); )
error = VOP_READDIR(cp->c_ovp, uiop, cred, eofflag, cookies,
ncookies);
if (error)
diff -r 82e6b5102d4e -r 22f48a9cf731 sys/compat/aout/aout_exec.c
--- a/sys/compat/aout/aout_exec.c Mon Nov 27 14:10:45 2000 +0000
+++ b/sys/compat/aout/aout_exec.c Fri Dec 08 09:06:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_exec.c,v 1.1.8.2 2000/11/22 16:02:20 bouyer Exp $ */
+/* $NetBSD: aout_exec.c,v 1.1.8.3 2000/12/08 09:08:07 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(_KERNEL) && !defined(_LKM)
#include "opt_syscall_debug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +48,6 @@
#include <compat/aout/aout_syscall.h>
-const char aout_emul_path[] = "/emul/aout";
extern struct sysent aout_sysent[];
#ifdef SYSCALL_DEBUG
extern const char * const aout_syscallnames[];
@@ -56,6 +57,7 @@
struct emul emul_netbsd_aout = {
"netbsd",
+ "/emul/aout",
NULL,
sendsig,
AOUT_SYS_syscall,
@@ -68,4 +70,8 @@
#endif
sigcode,
esigcode,
+ NULL,
+ NULL,
+ NULL,
+ EMUL_HAS_SYS___syscall,
};
diff -r 82e6b5102d4e -r 22f48a9cf731 sys/compat/aout/aout_misc.c
--- a/sys/compat/aout/aout_misc.c Mon Nov 27 14:10:45 2000 +0000
+++ b/sys/compat/aout/aout_misc.c Fri Dec 08 09:06:21 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aout_misc.c,v 1.3 1999/03/15 23:50:07 thorpej Exp $ */
+/* $NetBSD: aout_misc.c,v 1.3.8.1 2000/12/08 09:08:07 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(_KERNEL) && !defined(_LKM)
#include "opt_ktrace.h"
#include "opt_nfsserver.h"
#include "opt_compat_netbsd.h"
@@ -44,6 +45,7 @@
#include "fs_lfs.h"
#include "fs_nfs.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +56,7 @@
#include <sys/syscall.h>
#include <sys/syscallargs.h>
-#include <compat/aout/aout_util.h>
+#include <compat/common/compat_util.h>
#include <compat/aout/aout_syscall.h>
#include <compat/aout/aout_syscallargs.h>
@@ -69,10 +71,10 @@
#if 0
if (SCARG(uap, flags) & O_CREAT)
- AOUT_CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
+ CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
else
#endif
- AOUT_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+ CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
return sys_open(p, v, retval);
}
@@ -88,7 +90,7 @@
struct aout_sys_creat_args *uap = v;
caddr_t sg = stackgap_init(p->p_emul);
- AOUT_CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
+ CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
#endif
return compat_43_sys_creat(p, v, retval);
@@ -104,9 +106,9 @@
struct aout_sys_link_args *uap = v;
caddr_t sg = stackgap_init(p->p_emul);
- AOUT_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+ CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
#if 0
- AOUT_CHECK_ALT_CREAT(p, &sg, SCARG(uap, link));
+ CHECK_ALT_CREAT(p, &sg, SCARG(uap, link));
#endif
return sys_link(p, v, retval);
@@ -122,7 +124,7 @@
struct aout_sys_unlink_args *uap = v;
caddr_t sg = stackgap_init(p->p_emul);
- AOUT_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+ CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
return sys_unlink(p, v, retval);
}
@@ -137,7 +139,7 @@
struct aout_sys_chdir_args *uap = v;
caddr_t sg = stackgap_init(p->p_emul);
- AOUT_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+ CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
return sys_chdir(p, v, retval);
}
@@ -153,7 +155,7 @@
struct aout_sys_mknod_args *uap = v;
caddr_t sg = stackgap_init(p->p_emul);
- AOUT_CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
+ CHECK_ALT_CREAT(p, &sg, SCARG(uap, path));
#endif
Home |
Main Index |
Thread Index |
Old Index