Date: Mon, 12 Jul 2004 14:46:08 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 57181 for review Message-ID: <200407121446.i6CEk8hT019855@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=57181 Change 57181 by rwatson@rwatson_tislabs on 2004/07/12 14:45:18 Integrate netperf_socket from rwatson_netperf: ddb gets gdb command again ata recovery fixes vfs_root accepts thread argument vflush accepts thread argument kse debugging related changes nfs with ipv6 related fixes spls removed from netatalk -- looped back from rwatson_netperf ng_frame_relay constification -- looped back from rwatson_netperf ng_socket locking of global list -- looped back from rwatson_netperf Affected files ... .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#39 integrate .. //depot/projects/netperf_socket/sys/ddb/db_command.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/fwip/Makefile#1 branch .. //depot/projects/netperf_socket/sys/netatalk/at_control.c#6 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/netperf_socket/sys/sys/kdb.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/kse.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#19 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/ptrace.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#21 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#9 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.48 2004/06/16 09:46:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.50 2004/07/12 14:11:26 rwatson Exp $"); #include <vcoda.h> @@ -252,7 +252,7 @@ active = coda_kill(vfsp, NOT_DOWNCALL); ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); mi->mi_rootvp->v_vflag &= ~VV_ROOT; - error = vflush(mi->mi_vfsp, 0, FORCECLOSE); + error = vflush(mi->mi_vfsp, 0, FORCECLOSE, td); #ifdef CODA_VERBOSE printf("coda_unmount: active = %d, vflush active %d\n", active, error); #endif @@ -280,14 +280,14 @@ * find root of cfs */ int -coda_root(vfsp, vpp) +coda_root(vfsp, vpp, td) struct mount *vfsp; struct vnode **vpp; + struct thread *td; { struct coda_mntinfo *mi = vftomi(vfsp); struct vnode **result; int error; - struct thread *td = curthread; /* XXX - bnoble */ struct proc *p = td->td_proc; CodaFid VFid; static const CodaFid invalfid = INVAL_FID; ==== //depot/projects/netperf_socket/sys/conf/files#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.928 2004/07/10 23:47:18 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.929 2004/07/12 11:52:14 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1241,7 +1241,7 @@ net/if_ethersubr.c optional ether net/if_faith.c optional faith net/if_fddisubr.c optional fddi -net/if_fwsubr.c optional firewire +net/if_fwsubr.c optional fwip net/if_gif.c optional gif net/if_gre.c optional gre net/if_iso88025subr.c optional token ==== //depot/projects/netperf_socket/sys/ddb/db_command.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.54 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.55 2004/07/12 01:38:07 marcel Exp $"); #include <sys/param.h> #include <sys/linker_set.h> @@ -67,6 +67,7 @@ SET_DECLARE(db_show_cmd_set, struct command); static db_cmdfcn_t db_fncall; +static db_cmdfcn_t db_gdb; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_watchdog; @@ -414,6 +415,7 @@ { "call", db_fncall, CS_OWN, 0 }, { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, + { "gdb", db_gdb, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -611,3 +613,13 @@ EVENTHANDLER_INVOKE(watchdog_list, 0, &i); } + +static void +db_gdb(db_expr_t dummy1, boolean_t dummy2, db_expr_t dummy3, char *dummy4) +{ + + if (kdb_dbbe_select("gdb") != 0) + db_printf("The remote GDB backend could not be selected.\n"); + else + db_printf("Step to enter the remote GDB backend.\n"); +} ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.214 2004/06/22 11:18:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.215 2004/07/12 10:50:49 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -183,6 +183,13 @@ if (!dev || !(ch = device_get_softc(dev)) || !ch->r_irq) return ENXIO; + /* mark devices on this channel as detaching */ + ch->device[MASTER].flags |= ATA_D_DETACHING; + ch->device[SLAVE].flags |= ATA_D_DETACHING; + + /* fail outstanding requests on this channel */ + ata_fail_requests(ch, NULL); + /* detach devices on this channel */ if (ch->device[MASTER].detach) ch->device[MASTER].detach(&ch->device[MASTER]); @@ -192,9 +199,6 @@ atapi_cam_detach_bus(ch); #endif - /* fail outstanding requests on this channel */ - ata_fail_requests(ch, NULL); - /* flush cache and powerdown device */ if (ch->device[MASTER].param) { if (ch->device[MASTER].param->support.command2 & ATA_SUPPORT_FLUSHCACHE) @@ -285,18 +289,6 @@ ch->device[SLAVE].attach(&ch->device[SLAVE]); } - /* restore device config and transfermode on devices */ - if (ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) { - if (ch->device[MASTER].config) - ch->device[MASTER].config(&ch->device[MASTER]); - ch->device[MASTER].setmode(&ch->device[MASTER],ch->device[MASTER].mode); - } - if (ch->devices & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) { - if (ch->device[SLAVE].config) - ch->device[SLAVE].config(&ch->device[SLAVE]); - ch->device[SLAVE].setmode(&ch->device[SLAVE], ch->device[SLAVE].mode); - } - #ifdef DEV_ATAPICAM atapi_cam_reinit_bus(ch); #endif @@ -632,6 +624,7 @@ if (ata_getparam(&ch->device[SLAVE], ATA_ATAPI_IDENTIFY)) ch->devices &= ~ATA_ATAPI_SLAVE; else { + ata_controlcmd(&ch->device[SLAVE], ATA_ATAPI_RESET, 0, 0, 0); switch (ch->device[SLAVE].param->config & ATA_ATAPI_TYPE_MASK) { #ifdef DEV_ATAPICD case ATA_ATAPI_TYPE_CDROM: @@ -663,6 +656,7 @@ if (ata_getparam(&ch->device[MASTER], ATA_ATAPI_IDENTIFY)) ch->devices &= ~ATA_ATAPI_MASTER; else { + ata_controlcmd(&ch->device[MASTER], ATA_ATAPI_RESET, 0, 0, 0); switch (ch->device[MASTER].param->config & ATA_ATAPI_TYPE_MASK) { #ifdef DEV_ATAPICD case ATA_ATAPI_TYPE_CDROM: ==== //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.173 2004/06/22 11:18:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.174 2004/07/12 10:50:50 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -160,7 +160,6 @@ { struct ad_softc *adp = atadev->softc; - atadev->flags |= ATA_D_DETACHING; #ifdef DEV_ATARAID if (adp->flags & AD_F_RAID_SUBDISK) ata_raiddisk_detach(adp); ==== //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.31 2003/06/12 20:48:36 phk Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.32 2004/07/12 08:14:05 alfred Exp $ */ #include "opt_devfs.h" @@ -101,7 +101,7 @@ fmp->dm_basedir = fmp->dm_rootdir; devfs_rules_newmount(fmp, td); - error = devfs_root(mp, &rvp); + error = devfs_root(mp, &rvp, td); if (error) { lockdestroy(&fmp->dm_lock); FREE(fmp, M_DEVFS); @@ -130,7 +130,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; /* There is 1 extra root vnode reference from devfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); devfs_purge(fmp->dm_rootdir); @@ -144,16 +144,15 @@ /* Return locked reference to root. */ static int -devfs_root(mp, vpp) +devfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { int error; - struct thread *td; struct vnode *vp; struct devfs_mount *dmp; - td = curthread; /* XXX */ dmp = VFSTODEVFS(mp); error = devfs_allocv(dmp->dm_rootdir, mp, &vp, td); if (error) ==== //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.17 2004/04/07 20:45:59 imp Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc.h,v 1.18 2004/07/12 08:14:05 alfred Exp $ */ #ifdef _KERNEL @@ -58,8 +58,8 @@ #define VFSTOFDESC(mp) ((struct fdescmount *)((mp)->mnt_data)) #define VTOFDESC(vp) ((struct fdescnode *)(vp)->v_data) -extern int fdesc_init(struct vfsconf *); -extern int fdesc_root(struct mount *, struct vnode **); +extern vfs_init_t fdesc_init; +extern vfs_root_t fdesc_root; extern int fdesc_allocvp(fdntype, int, struct mount *, struct vnode **, struct thread *); #endif /* _KERNEL */ ==== //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.43 2004/04/07 20:45:59 imp Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.44 2004/07/12 08:14:05 alfred Exp $ */ /* @@ -117,7 +117,7 @@ * There is 1 extra root vnode reference corresponding * to f_root. */ - if ((error = vflush(mp, 1, flags)) != 0) + if ((error = vflush(mp, 1, flags, td)) != 0) return (error); /* @@ -130,9 +130,10 @@ } int -fdesc_root(mp, vpp) +fdesc_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#3 (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.36 2004/06/16 09:47:03 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.37 2004/07/12 08:14:06 alfred Exp $ */ @@ -300,7 +300,7 @@ goto failed; } - error = hpfs_root(mp, &vp); + error = hpfs_root(mp, &vp, td); if (error) { hpfs_cpdeinit(hpmp); hpfs_bmdeinit(hpmp); @@ -344,7 +344,7 @@ dprintf(("hpfs_unmount: vflushing...\n")); - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) { printf("hpfs_unmount: vflush failed: %d\n",error); return (error); @@ -371,7 +371,8 @@ static int hpfs_root( struct mount *mp, - struct vnode **vpp ) + struct vnode **vpp, + struct thread *td ) { int error = 0; struct hpfsmount *hpmp = VFSTOHPFS(mp); ==== //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.122 2004/07/04 08:52:33 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.123 2004/07/12 08:14:06 alfred Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -91,7 +91,8 @@ struct iconv_functions *msdosfs_iconv = NULL; -static int update_mp(struct mount *mp, struct msdosfs_args *argp); +static int update_mp(struct mount *mp, struct msdosfs_args *argp, + struct thread *td); static int mountmsdosfs(struct vnode *devvp, struct mount *mp, struct thread *td, struct msdosfs_args *argp); static vfs_fhtovp_t msdosfs_fhtovp; @@ -103,9 +104,10 @@ static vfs_vptofh_t msdosfs_vptofh; static int -update_mp(mp, argp) +update_mp(mp, argp, td) struct mount *mp; struct msdosfs_args *argp; + struct thread *td; { struct msdosfsmount *pmp = VFSTOMSDOSFS(mp); int error; @@ -139,7 +141,7 @@ if (FAT32(pmp)) pmp->pm_flags |= MSDOSFSMNT_LONGNAME; else { - if ((error = msdosfs_root(mp, &rootvp)) != 0) + if ((error = msdosfs_root(mp, &rootvp, td)) != 0) return error; pmp->pm_flags |= findwin95(VTODE(rootvp)) ? MSDOSFSMNT_LONGNAME @@ -187,7 +189,7 @@ flags = WRITECLOSE; if (mp->mnt_flag & MNT_FORCE) flags |= FORCECLOSE; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); } if (!error && (mp->mnt_flag & MNT_RELOAD)) /* not yet implemented */ @@ -282,7 +284,7 @@ return (error); } - error = update_mp(mp, &args); + error = update_mp(mp, &args, td); if (error) { msdosfs_unmount(mp, MNT_FORCE, td); return error; @@ -674,7 +676,7 @@ flags = 0; if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) return error; pmp = VFSTOMSDOSFS(mp); @@ -741,9 +743,10 @@ } static int -msdosfs_root(mp, vpp) +msdosfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct msdosfsmount *pmp = VFSTOMSDOSFS(mp); struct denode *ndep; ==== //depot/projects/netperf_socket/sys/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.58 2004/06/16 09:47:04 phk Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.59 2004/07/12 08:14:06 alfred Exp $ */ @@ -457,7 +457,7 @@ for(i=0;i<NTFS_SYSNODESNUM;i++) if(ntmp->ntm_sysvn[i]) vrele(ntmp->ntm_sysvn[i]); - if (vflush(mp, 0, 0)) + if (vflush(mp, 0, 0, td)) dprintf(("ntfs_mountfs: vflush failed\n")); out: @@ -487,7 +487,7 @@ flags |= FORCECLOSE; dprintf(("ntfs_unmount: vflushing...\n")); - error = vflush(mp, 0, flags | SKIPSYSTEM); + error = vflush(mp, 0, flags | SKIPSYSTEM, td); if (error) { printf("ntfs_unmount: vflush failed: %d\n",error); return (error); @@ -503,7 +503,7 @@ if(ntmp->ntm_sysvn[i]) vrele(ntmp->ntm_sysvn[i]); /* vflush system vnodes */ - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); if (error) printf("ntfs_unmount: vflush failed(sysnodes): %d\n",error); @@ -538,7 +538,8 @@ static int ntfs_root( struct mount *mp, - struct vnode **vpp ) + struct vnode **vpp, + struct thread *td ) { struct vnode *nvp; int error = 0; ==== //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.61 2004/07/10 21:20:11 marcel Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.62 2004/07/12 08:14:06 alfred Exp $ */ /* @@ -228,7 +228,7 @@ flags |= FORCECLOSE; /* There is 1 extra root vnode reference (nullm_rootvp). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -242,11 +242,11 @@ } static int -nullfs_root(mp, vpp) +nullfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { - struct thread *td = curthread; /* XXX */ struct vnode *vp; NULLFSDEBUG("nullfs_root(mp = %p, vp = %p->%p)\n", (void *)mp, ==== //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.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_vfsops.c,v 1.32 2003/12/07 17:37:44 des Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.33 2004/07/12 08:14:06 alfred Exp $ */ #include "opt_ncp.h" #ifndef NCP @@ -208,7 +208,7 @@ /* protect against invalid mount points */ nmp->m.mount_point[sizeof(nmp->m.mount_point)-1] = '\0'; vfs_getnewfsid(mp); - error = nwfs_root(mp, &vp); + error = nwfs_root(mp, &vp, td); if (error) goto bad; /* @@ -238,7 +238,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; /* There is 1 extra root vnode reference from nwfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); conn = NWFSTOCONN(nmp); @@ -257,13 +257,12 @@ /* Return locked vnode to root of a filesystem */ static int -nwfs_root(struct mount *mp, struct vnode **vpp) { +nwfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct vnode *vp; struct nwmount *nmp; struct nwnode *np; struct ncp_conn *conn; struct nw_entry_info fattr; - struct thread *td = curthread; struct ucred *cred = td->td_ucred; int error, nsf, opt; u_char vol; ==== //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.48 2004/04/07 20:46:01 imp Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.49 2004/07/12 08:14:06 alfred Exp $ */ /* @@ -170,7 +170,7 @@ return (EBUSY); #endif /* There is 1 extra root vnode reference (pm_root). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -194,9 +194,10 @@ } static int -portal_root(mp, vpp) +portal_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.19 2003/12/07 17:41:19 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.20 2004/07/12 08:14:07 alfred Exp $ */ #include <sys/param.h> @@ -295,7 +295,7 @@ /* XXX do stuff with pi... */ - error = vflush(mp, 0, (mntflags & MNT_FORCE) ? FORCECLOSE : 0); + error = vflush(mp, 0, (mntflags & MNT_FORCE) ? FORCECLOSE : 0, td); return (error); } @@ -303,7 +303,7 @@ * Return a root vnode */ int -pfs_root(struct mount *mp, struct vnode **vpp) +pfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct pfs_info *pi; ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.26 2003/12/07 17:41:19 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.27 2004/07/12 08:14:07 alfred Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED @@ -201,7 +201,8 @@ struct nameidata *ndp, struct thread *td); int pfs_unmount (struct mount *mp, int mntflags, struct thread *td); -int pfs_root (struct mount *mp, struct vnode **vpp); +int pfs_root (struct mount *mp, struct vnode **vpp, + struct thread *td); int pfs_statfs (struct mount *mp, struct statfs *sbp, struct thread *td); int pfs_init (struct pfs_info *pi, struct vfsconf *vfc); ==== //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.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_vfsops.c,v 1.23 2003/12/07 17:37:44 des Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.24 2004/07/12 08:14:07 alfred Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -189,7 +189,7 @@ /* protect against invalid mount points */ smp->sm_args.mount_point[sizeof(smp->sm_args.mount_point) - 1] = '\0'; vfs_getnewfsid(mp); - error = smbfs_root(mp, &vp); + error = smbfs_root(mp, &vp, td); if (error) goto bad; VOP_UNLOCK(vp, 0, td); @@ -238,7 +238,7 @@ do { smp->sm_didrele = 0; /* There is 1 extra root vnode reference from smbfs_mount(). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); } while (error == EBUSY && smp->sm_didrele != 0); if (error) return error; @@ -262,7 +262,7 @@ * Return locked root vnode of a filesystem */ static int -smbfs_root(struct mount *mp, struct vnode **vpp) +smbfs_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct smbmount *smp = VFSTOSMBFS(mp); struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#4 (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.18 2004/06/23 19:36:09 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.19 2004/07/12 08:14:07 alfred Exp $ */ /* udf_vfsops.c */ @@ -501,7 +501,7 @@ if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - if ((error = vflush(mp, 0, flags))) + if ((error = vflush(mp, 0, flags, td))) return (error); if (udfmp->im_flags & UDFMNT_KICONV && udf_iconv) { @@ -532,7 +532,7 @@ } static int -udf_root(struct mount *mp, struct vnode **vpp) +udf_root(struct mount *mp, struct vnode **vpp, struct thread *td) { struct udf_mnt *udfmp; struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/umapfs/umap_vfsops.c,v 1.56 2004/04/07 20:46:02 imp Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vfsops.c,v 1.57 2004/07/12 08:14:07 alfred Exp $ */ /* @@ -279,7 +279,7 @@ return (EBUSY); #endif /* There is 1 extra root vnode reference (umapm_rootvp). */ - error = vflush(mp, 1, flags); + error = vflush(mp, 1, flags, td); if (error) return (error); @@ -292,9 +292,10 @@ } static int -umapfs_root(mp, vpp) +umapfs_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct thread *td = curthread; /* XXX */ struct vnode *vp; ==== //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.65 2004/04/07 20:46:03 imp Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.66 2004/07/12 08:14:07 alfred Exp $ */ /* @@ -342,7 +342,7 @@ * (d) times, where (d) is the maximum tree depth * in the filesystem. */ - for (freeing = 0; (error = vflush(mp, 0, flags)) != 0;) { + for (freeing = 0; (error = vflush(mp, 0, flags, td)) != 0;) { int n; /* count #vnodes held on mount list */ @@ -378,9 +378,10 @@ } static int -union_root(mp, vpp) +union_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct union_mount *um = MOUNTTOUNIONMOUNT(mp); int error; ==== //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.107 2004/04/07 20:46:03 imp Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.108 2004/07/12 08:14:07 alfred Exp $ */ #include <sys/param.h> @@ -268,7 +268,7 @@ relock_pdvp = 1; vput(dvp); dvp = NULL; - error = VFS_ROOT(mp, &dvp); + error = VFS_ROOT(mp, &dvp, td); vfs_unbusy(mp, td); ==== //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.123 2004/07/04 08:52:33 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.124 2004/07/12 08:14:08 alfred Exp $ */ #include <sys/param.h> @@ -829,7 +829,7 @@ { int error; - error = vflush(mp, 0, flags); + error = vflush(mp, 0, flags, td); return (error); } @@ -1215,9 +1215,10 @@ * Return the root of a filesystem. */ static int -ext2_root(mp, vpp) +ext2_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct vnode *nvp; int error; ==== //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.118 2004/07/03 16:56:45 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.119 2004/07/12 08:14:08 alfred Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -554,7 +554,7 @@ if (mntinvalbuf(mp)) return EBUSY; #endif - if ((error = vflush(mp, 0, flags))) + if ((error = vflush(mp, 0, flags, td))) return (error); isomp = VFSTOISOFS(mp); @@ -578,9 +578,10 @@ * Return root of a filesystem */ static int -cd9660_root(mp, vpp) +cd9660_root(mp, vpp, td) struct mount *mp; struct vnode **vpp; + struct thread *td; { struct iso_mnt *imp = VFSTOISOFS(mp); struct iso_directory_record *dp = ==== //depot/projects/netperf_socket/sys/kern/init_main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.243 2004/06/16 00:26:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.244 2004/07/12 08:14:08 alfred Exp $"); #include "opt_init_path.h" #include "opt_mac.h" @@ -553,7 +553,7 @@ vfs_mountroot(); /* Get the vnode for '/'. Set p->p_fd->fd_cdir to reference it. */ - if (VFS_ROOT(TAILQ_FIRST(&mountlist), &rootvnode)) + if (VFS_ROOT(TAILQ_FIRST(&mountlist), &rootvnode, td)) panic("cannot find root vnode"); FILEDESC_LOCK(p->p_fd); p->p_fd->fd_cdir = rootvnode; ==== //depot/projects/netperf_socket/sys/kern/init_sysent.c#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.173 2004/07/02 00:38:55 marcel Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.174 2004/07/12 07:39:19 davidxu Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.174 2004/07/02 00:35:52 marcel Exp */ ==== //depot/projects/netperf_socket/sys/kern/kern_exit.c#14 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.238 2004/06/21 14:49:50 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.239 2004/07/12 05:07:50 marcel Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -429,6 +429,7 @@ mtx_lock(&Giant); PROC_LOCK(p); p->p_xstat = rv; + p->p_xlwpid = td->td_tid; *p->p_ru = p->p_stats->p_ru; mtx_lock_spin(&sched_lock); calcru(p, &p->p_ru->ru_utime, &p->p_ru->ru_stime, NULL); ==== //depot/projects/netperf_socket/sys/kern/kern_kse.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.182 2004/06/26 18:58:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.183 2004/07/12 07:39:19 davidxu Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,25 +126,36 @@ #ifndef _SYS_SYSPROTO_H_ struct kse_switchin_args { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407121446.i6CEk8hT019855>