From owner-p4-projects@FreeBSD.ORG Sun Jul 3 19:27:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C02181065672; Sun, 3 Jul 2011 19:27:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A7A0106564A for ; Sun, 3 Jul 2011 19:27:06 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 50C878FC1D for ; Sun, 3 Jul 2011 19:27:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p63JR5kd091170 for ; Sun, 3 Jul 2011 19:27:05 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p63JR5XI091167 for perforce@freebsd.org; Sun, 3 Jul 2011 19:27:05 GMT (envelope-from cnicutar@freebsd.org) Date: Sun, 3 Jul 2011 19:27:05 GMT Message-Id: <201107031927.p63JR5XI091167@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jul 2011 19:27:07 -0000 http://p4web.freebsd.org/@@195682?ac=10 Change 195682 by cnicutar@cnicutar_cronos on 2011/07/03 19:26:51 Keep retransmitting after TCP_MAXRXTSHIFT retransmits at a fixed rate (TCPTV_REXMTMAX). In the future all retransmits could possibly be stretched over the entire UTO period. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#4 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#4 (text+ko) ==== @@ -490,21 +490,24 @@ tcp_free_sackholes(tp); if (tp->t_rxtshift == 0) - tp->t_suto = 0; + /* UTO starting again since it's the first retransmit. */ + tp->t_suto = 0; if ((tp->t_flags & TF_SND_UTO) || ((tp->t_flags & TF_RCV_UTO) && tp->rcv_uto)) { - /* Using UTO for this connection. */ + /* + * Since we're using UTO for this connection we need to + * compute how much time we've got left. + */ uto_left = max(tp->snd_uto, tp->rcv_uto); - if (tp->t_suto) { + if (tp->t_suto) uto_left -= ticks_to_secs(ticks - tp->t_suto); - } /* * The user may choose a value that's less than TCP_MAXRXTSHIFT * retransmits. */ - if (tp->t_rxtshift > TCP_MAXRXTSHIFT || uto_left <= 0) { + if (uto_left <= 0) { /* Before or after the retransmits, UTO was exceeded. */ TCPSTAT_INC(tcps_timeoutdrop); tp = tcp_drop(tp, ETIMEDOUT); @@ -516,21 +519,14 @@ * Retransmission timer went off. Message has not * been acked within retransmit interval. Back off * to a longer retransmit interval and retransmit one segment. + * If using UTO, don't drop. t_rxtshift will hint it's not a + * normal retransmit. */ - if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) { - if (uto_left > 0) { - /* - * Reset the timer for UTO; t_rxtshift will hint - * that it's not a normal retransmit. - */ - callout_reset(&tp->t_timers->tt_rexmt, hz * uto_left, - tcp_timer_rexmt, tp); - } else { - tp->t_rxtshift = TCP_MAXRXTSHIFT; - TCPSTAT_INC(tcps_timeoutdrop); - tp = tcp_drop(tp, tp->t_softerror ? - tp->t_softerror : ETIMEDOUT); - } + if (++tp->t_rxtshift > TCP_MAXRXTSHIFT && uto_left <= 0) { + tp->t_rxtshift = TCP_MAXRXTSHIFT; + TCPSTAT_INC(tcps_timeoutdrop); + tp = tcp_drop(tp, tp->t_softerror ? + tp->t_softerror : ETIMEDOUT); goto out; } INP_INFO_WUNLOCK(&V_tcbinfo); @@ -558,13 +554,15 @@ TCPSTAT_INC(tcps_rexmttimeo); if (tp->t_state == TCPS_SYN_SENT) rexmt = TCP_REXMTVAL(tp) * tcp_syn_backoff[tp->t_rxtshift]; - else - rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; + else { + if (tp->t_rxtshift <= TCP_MAXRXTSHIFT) + rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; + else + /* We're in UTO, back off as much as we can. */ + rexmt = min(TCPTV_REXMTMAX, uto_left * hz); + } TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX); - if (uto_left) { - tp->t_rxtcur = min(tp->t_rxtcur, hz * uto_left); - } /* * Disable rfc1323 if we haven't got any response to * our third SYN to work-around some broken terminal servers From owner-p4-projects@FreeBSD.ORG Mon Jul 4 16:25:26 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 275851065672; Mon, 4 Jul 2011 16:25:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0BCB1065677 for ; Mon, 4 Jul 2011 16:25:25 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BF0B48FC18 for ; Mon, 4 Jul 2011 16:25:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p64GPPj6047601 for ; Mon, 4 Jul 2011 16:25:25 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p64GPPve047598 for perforce@freebsd.org; Mon, 4 Jul 2011 16:25:25 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 4 Jul 2011 16:25:25 GMT Message-Id: <201107041625.p64GPPve047598@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 16:25:26 -0000 http://p4web.freebsd.org/@@195716?ac=10 Change 195716 by ilya@ilya_triton2011 on 2011/07/04 16:25:24 Add fuse_vnode_setsize function Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#32 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#11 (text+ko) ==== @@ -80,15 +80,6 @@ #endif #endif -#ifndef FUSELIB_CONFORM_BIOREAD -/* - * make BIO behave as it's prescribed in fuselib's fuse.h, - * ie. in case of buffered reading, short reads instruct - * the kernel to fill the rest of the buffer with zeroes - */ -#define FUSELIB_CONFORM_BIOREAD 1 -#endif - /* misc */ extern int fuse_useco; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#13 (text+ko) ==== @@ -492,7 +492,7 @@ daddr_t lbn; int bcount; int n, on, err = 0; - vm_ooffset_t fsize = vp->v_object->un_pager.vnp.vnp_size; + off_t fsize = VTOFUD(vp)->filesize; DEBUG2G("fsize %lld\n", (long long int)fsize); @@ -535,7 +535,7 @@ long save; fsize = uio->uio_offset + n; - vnode_pager_setsize(vp, fsize); + fuse_vnode_setsize(vp, fsize); save = bp->b_flags & B_CACHE; bcount += n; @@ -558,7 +558,7 @@ bp = getblk(vp, lbn, bcount, PCATCH, 0, 0); if (uio->uio_offset + n > fsize) { fsize = uio->uio_offset + n; - vnode_pager_setsize(vp, fsize); + fuse_vnode_setsize(vp, fsize); } } @@ -701,6 +701,7 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp, struct fuse_filehandle *fufh, enum fuse_opcode op) { + struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_dispatcher fdi; struct ucred *cred; int err = 0; @@ -751,13 +752,7 @@ if (bp->b_iocmd == BIO_READ) { struct fuse_read_in *fri; int ioff = 0; -#if FUSELIB_CONFORM_BIOREAD - struct vattr va; - if ((err = VOP_GETATTR(vp, &va, cred))) - goto out; -#endif - bufdat = bp->b_data; bp->b_resid = bp->b_bcount; while (bp->b_resid > 0) { @@ -772,15 +767,13 @@ fri = fdi.indata; fri->fh = fufh->fh_id; fri->offset = ((off_t)bp->b_blkno) * biosize + ioff; -#if FUSELIB_CONFORM_BIOREAD chunksize = MIN(chunksize, MIN(fri->offset + bp->b_resid, - va.va_size) - fri->offset); + fvdat->filesize) - fri->offset); if (chunksize == 0) { respsize = -1; goto eval; } -#endif fri->size = chunksize; fdi.tick->tk_aw_type = FT_A_BUF; fdi.tick->tk_aw_bufdata = bufdat; @@ -796,9 +789,7 @@ bufdat += respsize; ioff += respsize; -#if FUSELIB_CONFORM_BIOREAD eval: -#endif DEBUG2G("%d bytes asked for from offset %llu, passing on the %d we got\n", chunksize, (long long unsigned)fri->offset, respsize); @@ -811,10 +802,8 @@ bp->b_resid); bzero((char *)bp->b_data + bp->b_bcount - bp->b_resid, bp->b_resid); -#if FUSELIB_CONFORM_BIOREAD if (chunksize) bp->b_resid = 0; -#endif break; } if (respsize > chunksize) { ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#12 (text+ko) ==== @@ -25,15 +25,16 @@ #include #include #include +#include +#include +#include +#include #include "fuse.h" #include "fuse_node.h" #include "fuse_internal.h" #include "fuse_ipc.h" -#include -#include - #define FUSE_DEBUG_MODULE VNOPS #include "fuse_debug.h" @@ -212,3 +213,12 @@ vnode_create_vobject(vp, 0, td); } } + +void +fuse_vnode_setsize(struct vnode *vp, off_t newsize) +{ + struct fuse_vnode_data *fvdat = VTOFUD(vp); + + vnode_pager_setsize(vp, newsize); + fvdat->filesize = newsize; +} ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#12 (text+ko) ==== @@ -109,17 +109,18 @@ void fuse_vnode_destroy(struct vnode *vp); -int -fuse_vnode_get(struct mount *mp, - uint64_t nodeid, - struct vnode *dvp, - struct vnode **vpp, - struct componentname *cnp, - enum vtype vtyp, - uint64_t size); +int fuse_vnode_get(struct mount *mp, + uint64_t nodeid, + struct vnode *dvp, + struct vnode **vpp, + struct componentname *cnp, + enum vtype vtyp, + uint64_t size); void fuse_vnode_open(struct vnode *vp, int32_t fuse_open_flags, struct thread *td); +void fuse_vnode_setsize(struct vnode *vp, off_t newsize); + #endif /* _FUSE_NODE_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#32 (text+ko) ==== @@ -508,8 +508,7 @@ off_t new_filesize = ((struct fuse_attr_out *)fdi.answ)->attr.size; if (fvdat->filesize != new_filesize) { - fvdat->filesize = new_filesize; - vnode_pager_setsize(vp, new_filesize); + fuse_vnode_setsize(vp, new_filesize); } } @@ -1724,8 +1723,7 @@ fuse_ticket_drop(fdi.tick); if (!err && sizechanged) { fuse_invalidate_attr(vp); - VTOFUD(vp)->filesize = newsize; - vnode_pager_setsize(vp, newsize); + fuse_vnode_setsize(vp, newsize); } return err; From owner-p4-projects@FreeBSD.ORG Mon Jul 4 16:26:32 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A9B41065674; Mon, 4 Jul 2011 16:26:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1849106566B for ; Mon, 4 Jul 2011 16:26:31 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D86488FC08 for ; Mon, 4 Jul 2011 16:26:31 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p64GQV4p047635 for ; Mon, 4 Jul 2011 16:26:31 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p64GQVRm047632 for perforce@freebsd.org; Mon, 4 Jul 2011 16:26:31 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 4 Jul 2011 16:26:31 GMT Message-Id: <201107041626.p64GQVRm047632@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 16:26:32 -0000 http://p4web.freebsd.org/@@195717?ac=10 Change 195717 by ilya@ilya_triton2011 on 2011/07/04 16:26:01 Fix vm page locking Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#33 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#33 (text+ko) ==== @@ -132,6 +132,18 @@ int fuse_pbuf_freecnt = -1; +#if __FreeBSD_version >= 900011 +#define fuse_vm_page_lock(m) vm_page_lock((m)); +#define fuse_vm_page_unlock(m) vm_page_unlock((m)); +#define fuse_vm_page_lock_queues() ((void)0) +#define fuse_vm_page_unlock_queues() ((void)0) +#else +#define fuse_vm_page_lock(m) ((void)0) +#define fuse_vm_page_unlock(m) ((void)0) +#define fuse_vm_page_lock_queues() vm_page_lock_queues() +#define fuse_vm_page_unlock_queues() vm_page_unlock_queues() +#endif + /* struct vnop_access_args { struct vnode *a_vp; @@ -1898,19 +1910,22 @@ vm_page_t m = pages[ap->a_reqpage]; VM_OBJECT_LOCK(vp->v_object); - vm_page_lock_queues(); + fuse_vm_page_lock_queues(); if (m->valid != 0) { /* handled by vm_fault now */ /* vm_page_zero_invalid(m, TRUE); */ for (i = 0; i < npages; ++i) { - if (i != ap->a_reqpage) + if (i != ap->a_reqpage) { + fuse_vm_page_lock(pages[i]); vm_page_free(pages[i]); + fuse_vm_page_unlock(pages[i]); + } } - vm_page_unlock_queues(); + fuse_vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vp->v_object); return(0); } - vm_page_unlock_queues(); + fuse_vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vp->v_object); } @@ -1947,12 +1962,15 @@ if (error && (FUSE_PAGEOPS_RESID == count)) { DEBUG2G("error %d\n", error); VM_OBJECT_LOCK(vp->v_object); - vm_page_lock_queues(); + fuse_vm_page_lock_queues(); for (i = 0; i < npages; ++i) { - if (i != ap->a_reqpage) + if (i != ap->a_reqpage) { + fuse_vm_page_lock(pages[i]); vm_page_free(pages[i]); + fuse_vm_page_unlock(pages[i]); + } } - vm_page_unlock_queues(); + fuse_vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vp->v_object); return VM_PAGER_ERROR; } @@ -1965,7 +1983,7 @@ size = count - FUSE_PAGEOPS_RESID; VM_OBJECT_LOCK(vp->v_object); - vm_page_lock_queues(); + fuse_vm_page_lock_queues(); for (i = 0, toff = 0; i < npages; i++, toff = nextoff) { vm_page_t m; nextoff = toff + PAGE_SIZE; @@ -2007,21 +2025,24 @@ * now tell them that it is ok to use. */ if (!error) { -#ifdef VPO_WANTED - if (m->oflags & VPO_WANTED) -#else - if (m->flags & PG_WANTED) -#endif + if (m->oflags & VPO_WANTED) { + fuse_vm_page_lock(m); vm_page_activate(m); - else + fuse_vm_page_unlock(m); + } else { + fuse_vm_page_lock(m); vm_page_deactivate(m); + fuse_vm_page_unlock(m); + } vm_page_wakeup(m); } else { + fuse_vm_page_lock(m); vm_page_free(m); + fuse_vm_page_unlock(m); } } } - vm_page_unlock_queues(); + fuse_vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vp->v_object); return 0; } From owner-p4-projects@FreeBSD.ORG Mon Jul 4 16:27:38 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607411065670; Mon, 4 Jul 2011 16:27:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AF67106564A for ; Mon, 4 Jul 2011 16:27:38 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EDB168FC0A for ; Mon, 4 Jul 2011 16:27:37 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p64GRb3c047670 for ; Mon, 4 Jul 2011 16:27:37 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p64GRbTO047667 for perforce@freebsd.org; Mon, 4 Jul 2011 16:27:37 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 4 Jul 2011 16:27:37 GMT Message-Id: <201107041627.p64GRbTO047667@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 16:27:38 -0000 http://p4web.freebsd.org/@@195718?ac=10 Change 195718 by ilya@ilya_triton2011 on 2011/07/04 16:27:16 Mark FUSE MPSAFE. Remove file create serialization. Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#34 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#13 (text+ko) ==== @@ -56,9 +56,6 @@ } vp->v_type = vtyp; vp->v_data = fvdat; - fvdat->create_owner = curthread->td_tid; - cv_init(&fvdat->create_cv, "fuse node create cv"); - sx_init(&fvdat->create_lock, "fuse node create lock"); sx_init(&fvdat->nodelock, "fuse node sx lock"); sx_init(&fvdat->truncatelock, "fuse node truncate sx lock"); @@ -74,8 +71,6 @@ struct fuse_vnode_data *fvdat = vp->v_data; vp->v_data = NULL; - cv_destroy(&fvdat->create_cv); - sx_destroy(&fvdat->create_lock); sx_destroy(&fvdat->nodelock); sx_destroy(&fvdat->truncatelock); free(fvdat, M_FUSEVN); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#13 (text+ko) ==== @@ -39,12 +39,6 @@ uint64_t nlookup; enum vtype vtype; - /** locking **/ - - struct sx create_lock; - struct cv create_cv; - lwpid_t create_owner; - /* * The nodelock must be held when data in the FUSE node is accessed or * modified. Typically, we would take this lock at the beginning of a ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#17 (text+ko) ==== @@ -248,9 +248,7 @@ vfs_getnewfsid(mp); mp->mnt_flag |= MNT_LOCAL; -#ifdef XXXIP mp->mnt_kern_flag |= MNTK_MPSAFE; -#endif if (subtype) { strlcat(mp->mnt_stat.f_fstypename, ".", MFSNAMELEN); strlcat(mp->mnt_stat.f_fstypename, subtype, MFSNAMELEN); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#34 (text+ko) ==== @@ -1188,36 +1188,6 @@ fufh_type = fuse_filehandle_xlate_from_fflags(mode); } - if (!isdir && (fvdat->flag & FN_CREATING)) { - - sx_xlock(&fvdat->create_lock); - - if (fvdat->flag & FN_CREATING) { // check again - if (fvdat->create_owner == curthread->td_tid) { - fufh_type = FUFH_RDWR; - MPASS(fuse_filehandle_valid(vp, fufh_type)); - fvdat->flag &= ~FN_CREATING; - sx_xunlock(&fvdat->create_lock); - cv_broadcast(&fvdat->create_cv); // wake up all - return 0; - } else { - debug_printf("contender going to sleep\n"); - error = cv_wait_sig(&fvdat->create_cv, &fvdat->create_lock); - debug_printf("contender awake (error = %d)\n", error); - if (error) { - /* - * We'll be woken up in case a signal arrives. - * The value of error could be EINTR or ERESTART. - */ - return error; - } - } - } else { - sx_xunlock(&fvdat->create_lock); - /* Can proceed from here. */ - } - } - if (fuse_filehandle_valid(vp, fufh_type)) { fuse_vnode_open(vp, 0, td); return 0; From owner-p4-projects@FreeBSD.ORG Mon Jul 4 16:28:44 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DDDF1065670; Mon, 4 Jul 2011 16:28:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 283A2106564A for ; Mon, 4 Jul 2011 16:28:44 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0E6C58FC19 for ; Mon, 4 Jul 2011 16:28:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p64GShTm047699 for ; Mon, 4 Jul 2011 16:28:43 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p64GSh7Z047696 for perforce@freebsd.org; Mon, 4 Jul 2011 16:28:43 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 4 Jul 2011 16:28:43 GMT Message-Id: <201107041628.p64GSh7Z047696@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 16:28:44 -0000 http://p4web.freebsd.org/@@195719?ac=10 Change 195719 by ilya@ilya_triton2011 on 2011/07/04 16:27:47 Add user space daemon reply timeout Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#12 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#18 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#12 (text+ko) ==== @@ -6,6 +6,11 @@ #include "fuse4bsd.h" #include "fuse_kernel.h" +#define FUSE_DEFAULT_DAEMON_TIMEOUT 60 /* s */ +#define FUSE_MIN_DAEMON_TIMEOUT 0 /* s */ +#define FUSE_MAX_DAEMON_TIMEOUT 600 /* s */ + + /* Mapping versions to features */ #define FUSE_KERNELABI_GEQ(maj, min) \ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#9 (text+ko) ==== @@ -195,6 +195,7 @@ fticket_wait_answer(struct fuse_ticket *ftick) { int err = 0; + struct fuse_data *data; debug_printf("ftick=%p\n", ftick); fuse_lck_mtx_lock(ftick->tk_aw_mtx); @@ -203,13 +204,25 @@ goto out; } - if (fdata_get_dead(ftick->tk_data)) { + data = ftick->tk_data; + + if (fdata_get_dead(data)) { err = ENOTCONN; fticket_set_answered(ftick); goto out; } - err = msleep(ftick, &ftick->tk_aw_mtx, PCATCH, "fu_ans", 0); + err = msleep(ftick, &ftick->tk_aw_mtx, PCATCH, "fu_ans", + data->daemon_timeout * hz); + if (err == EAGAIN) { /* same as EWOULDBLOCK */ +#ifdef XXXIP /* die conditionally */ + if (!fdata_get_dead(data)) { + fdata_set_dead(data); + } +#endif + err = ETIMEDOUT; + fticket_set_answered(ftick); + } out: fuse_lck_mtx_unlock(ftick->tk_aw_mtx); @@ -301,6 +314,7 @@ data->ticketer = 0; data->freeticket_counter = 0; data->daemoncred = crhold(cred); + data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT; #ifdef FUSE_EXPLICIT_RENAME_LOCK sx_init(&data->rename_lock, "fuse rename lock"); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#10 (text+ko) ==== @@ -146,6 +146,8 @@ char volname[MAXPATHLEN]; struct selinfo ks_rsel; + + int daemon_timeout; }; #define FSESS_DEAD 0x0001 // session is to be closed ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#18 (text+ko) ==== @@ -85,6 +85,7 @@ int __mntopts = 0; int max_read_set = 0; uint32_t max_read = ~0; + int daemon_timeout; size_t len; @@ -208,6 +209,13 @@ if (vfs_scanopt(opts, "max_read=", "%u", &max_read) == 1) max_read_set = 1; + if (vfs_scanopt(opts, "timeout=", "%u", &daemon_timeout) == 1) { + if (daemon_timeout < FUSE_MIN_DAEMON_TIMEOUT) + daemon_timeout = FUSE_MIN_DAEMON_TIMEOUT; + else if (daemon_timeout > FUSE_MAX_DAEMON_TIMEOUT) + daemon_timeout = FUSE_MAX_DAEMON_TIMEOUT; + data->daemon_timeout = daemon_timeout; + } subtype = vfs_getopts(opts, "subtype=", &err); err = 0; From owner-p4-projects@FreeBSD.ORG Mon Jul 4 17:18:06 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54FC51065673; Mon, 4 Jul 2011 17:18:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1784E106566C for ; Mon, 4 Jul 2011 17:18:06 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 05E688FC0A for ; Mon, 4 Jul 2011 17:18:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p64HI56d057495 for ; Mon, 4 Jul 2011 17:18:05 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p64HI5nv057492 for perforce@freebsd.org; Mon, 4 Jul 2011 17:18:05 GMT (envelope-from syuu@FreeBSD.org) Date: Mon, 4 Jul 2011 17:18:05 GMT Message-Id: <201107041718.p64HI5nv057492@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 17:18:06 -0000 http://p4web.freebsd.org/@@195722?ac=10 Change 195722 by syuu@kikurage on 2011/07/04 17:17:29 SOFT_MULTIQUEUE and its ioctls worked on ifconfig command Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sbin/ifconfig/ifconfig.c#3 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#3 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if.h#5 edit .. //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#5 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sbin/ifconfig/ifconfig.c#3 (text+ko) ==== @@ -962,23 +962,23 @@ }else perror("ioctl"); - printf("\trxqueue len:%d affinity:", rxqlen); + printf("\trxqueue len=%d affinity=[", rxqlen); for (i = 0; i < rxqlen; i++) { - ifr.ifr_queue_affinity_idx = i; + ifr.ifr_queue_affinity_index = i; if (ioctl(s, SIOCGIFRXQAFFINITY, &ifr) == 0) - printf(" %d:%d", ifr.ifr_queue_affinity_idx, + printf(" %d:%d", ifr.ifr_queue_affinity_index, ifr.ifr_queue_affinity_cpu); } - putchar('\n'); + printf(" ]\n"); - printf("\ttxqueue len:%d affinity:", txqlen); + printf("\ttxqueue len=%d affinity=[", txqlen); for (i = 0; i < txqlen; i++) { - ifr.ifr_queue_affinity_idx = i; + ifr.ifr_queue_affinity_index = i; if (ioctl(s, SIOCGIFTXQAFFINITY, &ifr) == 0) - printf(" %d:%d", ifr.ifr_queue_affinity_idx, + printf(" %d:%d", ifr.ifr_queue_affinity_index, ifr.ifr_queue_affinity_cpu); } - putchar('\n'); + printf(" ]\n"); } tunnel_status(s); ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#3 (text+ko) ==== @@ -2433,7 +2433,9 @@ !ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE) return (EOPNOTSUPP); KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set")); - ifr->ifr_affinity_cpu = ifp->if_get_rxqueue_affinity(ifp, ifr->ifr_affinity_que); + log(LOG_DEBUG, "%s: SIOCGIFRXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index); + ifr->ifr_queue_affinity_cpu = ifp->if_get_rxqueue_affinity(ifp, ifr->ifr_queue_affinity_index); + log(LOG_DEBUG, "%s: SIOCGIFRXQAFFINITY ifr_queue_affinity_cpu:%d\n", __func__, ifr->ifr_queue_affinity_cpu); break; case SIOCGIFTXQAFFINITY: @@ -2441,7 +2443,9 @@ !ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE) return (EOPNOTSUPP); KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set")); - ifr->ifr_affinity_cpu = ifp->if_get_rxqueue_affinity(ifp, ifr->ifr_affinity_que); + log(LOG_DEBUG, "%s: SIOCGIFTXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index); + ifr->ifr_queue_affinity_cpu = ifp->if_get_rxqueue_affinity(ifp, ifr->ifr_queue_affinity_index); + log(LOG_DEBUG, "%s: SIOCGIFTXQAFFINITY ifr_queue_affinity_cpu:%d\n", __func__, ifr->ifr_queue_affinity_cpu); break; default: ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if.h#5 (text+ko) ==== @@ -337,8 +337,8 @@ #define ifr_index ifr_ifru.ifru_index /* interface index */ #define ifr_rxqueue_len ifr_ifru.ifru_queue_len[0] /* rxqueue len */ #define ifr_txqueue_len ifr_ifru.ifru_queue_len[1] /* txqueue len */ -#define ifr_affinity_que ifr_ifru.ifru_queue_affinity[0] /* queue id */ -#define ifr_affinity_cpu ifr_ifru.ifru_queue_affinity[1] /* cpu id */ +#define ifr_queue_affinity_index ifr_ifru.ifru_queue_affinity[0] /* queue id */ +#define ifr_queue_affinity_cpu ifr_ifru.ifru_queue_affinity[1] /* cpu id */ }; #define _SIZEOF_ADDR_IFREQ(ifr) \ ==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_ethersubr.c#5 (text+ko) ==== @@ -1061,13 +1061,17 @@ if_printf(ifp, "Ethernet address: %6D\n", lla, ":"); #ifdef SOFTRSS - if (!ifp->if_capabilities & IFCAP_MULTIQUEUE) { + printf("%s: SOFTRSS if:%s\n", __func__, ifp->if_xname); + if (!(ifp->if_capabilities & IFCAP_MULTIQUEUE)) { + printf("%s: !IFCAP_MULTIQUEUE if:%s\n", __func__, ifp->if_xname); ifp->if_capabilities |= IFCAP_SOFT_MULTIQUEUE; ifp->if_capenable |= IFCAP_SOFT_MULTIQUEUE; ifp->if_get_rxqueue_len = softrss_get_rxqueue_len; ifp->if_get_txqueue_len = softrss_get_txqueue_len; ifp->if_get_rxqueue_affinity = softrss_get_rxqueue_affinity; ifp->if_get_txqueue_affinity = softrss_get_txqueue_affinity; + }else{ + printf("%s: IFCAP_MULTIQUEUE if:%s\n", __func__, ifp->if_xname); } #endif } @@ -1471,7 +1475,7 @@ static int softrss_get_rxqueue_affinity(struct ifnet *ifp, int queid) { - netisr_get_cpuid(queid); + return netisr_get_cpuid(queid); } static int From owner-p4-projects@FreeBSD.ORG Tue Jul 5 21:20:14 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D30741065670; Tue, 5 Jul 2011 21:20:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9430B106564A for ; Tue, 5 Jul 2011 21:20:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 832068FC1C for ; Tue, 5 Jul 2011 21:20:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p65LKEPv096471 for ; Tue, 5 Jul 2011 21:20:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p65LKE2s096467 for perforce@freebsd.org; Tue, 5 Jul 2011 21:20:14 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 5 Jul 2011 21:20:14 GMT Message-Id: <201107052120.p65LKE2s096467@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:20:15 -0000 http://p4web.freebsd.org/@@195778?ac=10 Change 195778 by rene@rene_acer on 2011/07/05 21:20:14 Checkpoint for network-servers 1.130 -> 1.134 update Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#42 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#42 (text+ko) ==== @@ -4185,6 +4185,112 @@ + <acronym + role="Domain Name Security Extensions">DNSSEC</acronym> + + + BIND + + DNS veiligheidsuitbreidingen + + + Domain Name Security System Extentions, ofwel DNSSEC, is een + verzameling van specificaties om resolvende naamservers te beschermen + tegen valse DNS-gegevens, zoals vervalste + DNS-records. Door digitale handtekeningen te + gebruiken kan een resolver de integriteit van een record controleren. + Merk op dat DNSSEC + alleen integriteit biedt via het digitaal ondertekenen van de Resource + Record (RRs). Het biedt noch + betrouwbaarheid noch bescherming tegen onjuiste aannames van + eindgebruikers. Dit betekent dat het mensen niet kan beschermen tegen + het bezoeken van voorbeeld.net in + plaats van voorbeeld.com. Het enige + wat DNSSEC doet is authenticeren dat de gegevens + niet tijdens het transport zijn gecompromitteerd. De beveiliging van + DNSSEC is een belangrijke stap in het beveiligen van + het internet in het algemeen. De relevante RFCs zijn + een goed beginpunt voor meer gedetailleerde gegevens over hoe + DNSSEC werkt. Raadpleeg de lijst in + . + + De volgende secties laten zien hoe DNSSEC voor een + autoratieve DNS-server en een recursieve (of caching) + DNS-server die BIND 9 draait kan + worden bewerkstelligd. Hoewel alle versies van BIND + 9 DNSSEC ondersteunen, is tenminste versie 9.6.2 + nodig om gebruik te kunnen maken van de ondertekende rootzones tijdens + het valideren van DNS-verzoeken. Dit komt doordat + eerdere versies de benodigde algoritmes om validatie met de sleutel + voor de rootzone te uit te veoren niet hebben. Het wordt sterk + aangeraden om de nieuwste versie van BIND 9.7 te + gebruiken om gebruik te kunnen maken van automatische sleutel-updates + voor de rootsleutel en van andere mogelijkheden om zones ondertekend en + sleutel up-to-date te houden. Wanneer configuraties tussen 9.6.2 en 9.7 + en later verschillen, zullen deze worden toegelicht. + + + Configuratie van een recursieve + <acronym>DNS</acronym>-server + + Het aanzetten van DNSSEC-validatie van + verzoeken die door een recursieve DNS-server worden + uitgevoerd heeft enkele aanpassingen aan + named.conf nodig. Voordat deze wijzigingen + worden worden gemaakt dient de rootzone-sleutel, of vertrouwensanker, + worden opgehaald. Momenteel is de rootzone-sleutel niet beschikbaar + in een bestandsformaat dat BIND begrijpt, dus moet + het handmatig in het juiste formaat omgezet worden. De sleutel zelf + kan verkregen worden door de rootzone ervoor met + dig te ondervragen. Door + + &prompt.user; dig +multi +noall +answer DNSKEY . > root.dnskey + + te draaien, wordt de sleutel in root.dnskey + opgeslagen. De inhoud dient er ongeveer als volgt uit te zien: + + . 93910 IN DNSKEY 257 3 8 ( + AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQ + bSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh + /RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWA + JQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXp + oY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3 + LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGO + Yl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGc + LmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= + ) ; key id = 19036 +. 93910 IN DNSKEY 256 3 8 ( + AwEAAcaGQEA+OJmOzfzVfoYN249JId7gx+OZMbxy69Hf + UyuGBbRN0+HuTOpBxxBCkNOL+EJB9qJxt+0FEY6ZUVjE + g58sRr4ZQ6Iu6b1xTBKgc193zUARk4mmQ/PPGxn7Cn5V + EGJ/1h6dNaiXuRHwR+7oWh7DnzkIJChcTqlFrXDW3tjt + ) ; key id = 34525 + + Schrik niet als de verkregen sleutels anders zijn dan in dit + voorbeeld. Ze kunnen zijn veranderd nadat deze instructies voor het + laatst waren bijgewerkt. De uitvoer bevat in feite twee sleutels. De + eerste sleutel, met de waarde 257 na het DNSKEY-recordtype, is degene + die nodig is. Deze waarde geeft aan dat dit een Secure Entry Point ( + SEP) is, beter bekend als + een Key Signing Key (KSK). + De tweede sleutel, met de waarde 256, is een deelsleutel, beter bekend + als een Zone Signing Key (ZSK). Meer over de verschillende + soorten sleutels komt aan bod in . + + + + + + Configuratie van een autoratieve + <acronym>DNS</acronym>-server + + + + + Beveiliging Hoewel BIND de meest gebruikte implementatie van DNS is, is From owner-p4-projects@FreeBSD.ORG Tue Jul 5 21:46:34 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB8921065676; Tue, 5 Jul 2011 21:46:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE466106564A for ; Tue, 5 Jul 2011 21:46:33 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9DA658FC13 for ; Tue, 5 Jul 2011 21:46:33 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p65LkXRb001862 for ; Tue, 5 Jul 2011 21:46:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p65LkXWg001859 for perforce@freebsd.org; Tue, 5 Jul 2011 21:46:33 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 5 Jul 2011 21:46:33 GMT Message-Id: <201107052146.p65LkXWg001859@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 21:46:34 -0000 http://p4web.freebsd.org/@@195780?ac=10 Change 195780 by rene@rene_acer on 2011/07/05 21:45:31 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#4 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.34 2008/12/07 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.35 2011/07/05 11:09:50 gjb Exp $ --> @@ -79,7 +79,7 @@ will install the same suite of applications on your machine. Note that you can produce only HTML or ASCII text output if you do not install JadeTeX. - PostScript or PDF output require &tex;. + PostScript or PDF output requires &tex;. From owner-p4-projects@FreeBSD.ORG Tue Jul 5 23:41:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 223D71065672; Tue, 5 Jul 2011 23:41:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D863F106566C for ; Tue, 5 Jul 2011 23:41:36 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C5B5D8FC0C for ; Tue, 5 Jul 2011 23:41:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p65Nfa8Q025289 for ; Tue, 5 Jul 2011 23:41:36 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p65NfaZN025286 for perforce@freebsd.org; Tue, 5 Jul 2011 23:41:36 GMT (envelope-from jceel@freebsd.org) Date: Tue, 5 Jul 2011 23:41:36 GMT Message-Id: <201107052341.p65NfaZN025286@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 23:41:37 -0000 http://p4web.freebsd.org/@@195784?ac=10 Change 195784 by jceel@jceel_cyclone on 2011/07/05 23:41:35 * Added working USB OHCI controller driver with ISP3101 transceiver initialization * Refactored peripheral power control, moved peripheral clocks setup from lpc_pwr to each driver attach() method. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#4 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_mmc.c#1 add .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_ohci.c#3 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_pwr.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_timer.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#4 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#4 (text+ko) ==== @@ -60,6 +60,8 @@ #include #include +#include +#include #include #include "miibus_if.h" @@ -247,6 +249,9 @@ goto fail; } + /* Enable Ethernet clock */ + lpc_pwr_write(dev, LPC_CLKPWR_MACCLK_CTRL, 0x1f); /* XXX */ + /* Reset chip */ lpe_reset(sc); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_ohci.c#3 (text+ko) ==== @@ -47,6 +47,8 @@ #include #include +#include + #include #include @@ -63,12 +65,36 @@ #include #include +#include +#include +#define I2C_START_BIT (1 << 8) +#define I2C_STOP_BIT (1 << 9) +#define I2C_READ 0x01 +#define I2C_WRITE 0x00 +#define DUMMY_BYTE 0x55 +#define lpc_otg_read_4(_sc, _reg) \ + bus_space_read_4(_sc->sc_io_tag, _sc->sc_io_hdl, _reg) +#define lpc_otg_write_4(_sc, _reg, _value) \ + bus_space_write_4(_sc->sc_io_tag, _sc->sc_io_hdl, _reg, _value) +#define lpc_otg_wait_write_4(_sc, _wreg, _sreg, _value) \ + do { \ + lpc_otg_write_4(_sc, _wreg, _value); \ + while ((lpc_otg_read_4(_sc, _sreg) & _value) != _value); \ + } while (0); + static int lpc_ohci_probe(device_t dev); static int lpc_ohci_attach(device_t dev); static int lpc_ohci_detach(device_t dev); +static void lpc_otg_i2c_reset(struct ohci_softc *); + +static int lpc_isp3101_read(struct ohci_softc *, int); +static void lpc_isp3101_write(struct ohci_softc *, int, int); +static void lpc_isp3101_clear(struct ohci_softc *, int, int); +static void lpc_isp3101_configure(device_t dev, struct ohci_softc *); + static int lpc_ohci_probe(device_t dev) { @@ -85,6 +111,9 @@ struct ohci_softc *sc = device_get_softc(dev); int err; int rid; + int i = 0; + uint32_t usbctrl; + uint32_t otgstatus; sc->sc_bus.parent = dev; sc->sc_bus.devices = sc->sc_devices; @@ -97,7 +126,7 @@ rid = 0; sc->sc_io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (!sc->sc_io_res) { - device_printf(dev, "cannot map register space\n"); + device_printf(dev, "cannot map OHCI register space\n"); goto fail; } @@ -105,6 +134,8 @@ sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); sc->sc_io_size = rman_get_size(sc->sc_io_res); + device_printf(dev, "virtual register space: 0x%08lx\n", sc->sc_io_hdl); + rid = 0; sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->sc_irq_res == NULL) { @@ -126,8 +157,52 @@ goto fail; } - bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, - OHCI_CONTROL, 0); + usbctrl = lpc_pwr_read(dev, LPC_CLKPWR_USB_CTRL); + usbctrl |= LPC_CLKPWR_USB_CTRL_SLAVE_HCLK | LPC_CLKPWR_USB_CTRL_BUSKEEPER; + lpc_pwr_write(dev, LPC_CLKPWR_USB_CTRL, usbctrl); + + /* Enable OTG I2C clock */ + lpc_otg_wait_write_4(sc, LPC_OTG_CLOCK_CTRL, + LPC_OTG_CLOCK_STATUS, LPC_OTG_CLOCK_CTRL_I2C_EN); + + /* Reset OTG I2C bus */ + lpc_otg_i2c_reset(sc); + + lpc_isp3101_configure(dev, sc); + + /* Configure PLL */ + usbctrl &= ~(LPC_CLKPWR_USB_CTRL_CLK_EN1 | LPC_CLKPWR_USB_CTRL_CLK_EN2); + lpc_pwr_write(dev, LPC_CLKPWR_USB_CTRL, usbctrl); + + usbctrl |= LPC_CLKPWR_USB_CTRL_CLK_EN1; + lpc_pwr_write(dev, LPC_CLKPWR_USB_CTRL, usbctrl); + + usbctrl |= LPC_CLKPWR_USB_CTRL_FDBKDIV(192-1); + usbctrl |= LPC_CLKPWR_USB_CTRL_POSTDIV(1); + usbctrl |= LPC_CLKPWR_USB_CTRL_PLL_PDOWN; + + lpc_pwr_write(dev, LPC_CLKPWR_USB_CTRL, usbctrl); + do { + usbctrl = lpc_pwr_read(dev, LPC_CLKPWR_USB_CTRL); + if (i++ > 100000) { + device_printf(dev, "USB OTG PLL doesn't lock!\n"); + goto fail; + } + } while ((usbctrl & LPC_CLKPWR_USB_CTRL_PLL_LOCK) == 0); + + usbctrl |= LPC_CLKPWR_USB_CTRL_CLK_EN2; + usbctrl |= LPC_CLKPWR_USB_CTRL_HOST_NEED_CLK_EN; + lpc_pwr_write(dev, LPC_CLKPWR_USB_CTRL, usbctrl); + lpc_otg_wait_write_4(sc, LPC_OTG_CLOCK_CTRL, LPC_OTG_CLOCK_STATUS, + (LPC_OTG_CLOCK_CTRL_AHB_EN | LPC_OTG_CLOCK_CTRL_OTG_EN | + LPC_OTG_CLOCK_CTRL_I2C_EN | LPC_OTG_CLOCK_CTRL_HOST_EN)); + + otgstatus = lpc_otg_read_4(sc, LPC_OTG_STATUS); + lpc_otg_write_4(sc, LPC_OTG_STATUS, otgstatus | + LPC_OTG_STATUS_HOST_EN); + + lpc_isp3101_write(sc, LPC_ISP3101_OTG_CONTROL_1, + LPC_ISP3101_OTG1_VBUS_DRV); err = ohci_init(sc); if (err) @@ -145,6 +220,106 @@ } static int +lpc_isp3101_read(struct ohci_softc *sc, int reg) +{ + int status; + int i = 0; + + lpc_otg_write_4(sc, LPC_OTG_I2C_TXRX, + (LPC_ISP3101_I2C_ADDR << 1) | I2C_START_BIT); + lpc_otg_write_4(sc, LPC_OTG_I2C_TXRX, reg); + lpc_otg_write_4(sc, LPC_OTG_I2C_TXRX, (LPC_ISP3101_I2C_ADDR << 1) | + I2C_START_BIT | I2C_READ); + lpc_otg_write_4(sc, LPC_OTG_I2C_TXRX, I2C_STOP_BIT | DUMMY_BYTE); + + do { + status = lpc_otg_read_4(sc, LPC_OTG_I2C_STATUS); + i++; + } while ((status & LPC_OTG_I2C_STATUS_TDI) == 0 || i < 100000); + + lpc_otg_write_4(sc, LPC_OTG_I2C_STATUS, LPC_OTG_I2C_STATUS_TDI); + + return (lpc_otg_read_4(sc, LPC_OTG_I2C_TXRX) & 0xff); +} + +static void +lpc_otg_i2c_reset(struct ohci_softc *sc) +{ + int ctrl; + int i = 0; + + lpc_otg_write_4(sc, LPC_OTG_I2C_CLKHI, 0x3f); + lpc_otg_write_4(sc, LPC_OTG_I2C_CLKLO, 0x3f); + + ctrl = lpc_otg_read_4(sc, LPC_OTG_I2C_CTRL); + lpc_otg_write_4(sc, LPC_OTG_I2C_CTRL, ctrl | LPC_OTG_I2C_CTRL_SRST); + + do { + ctrl = lpc_otg_read_4(sc, LPC_OTG_I2C_CTRL); + i++; + } while (ctrl & LPC_OTG_I2C_CTRL_SRST); +} + +static void +lpc_isp3101_write(struct ohci_softc *sc, int reg, int value) +{ + int status; + int i = 0; + + bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, LPC_OTG_I2C_TXRX, + (LPC_ISP3101_I2C_ADDR << 1) | I2C_START_BIT); + bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, LPC_OTG_I2C_TXRX, + (reg | I2C_WRITE)); + bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, LPC_OTG_I2C_TXRX, + (value | I2C_STOP_BIT)); + + do { + status = bus_space_read_4(sc->sc_io_tag, sc->sc_io_hdl, + LPC_OTG_I2C_STATUS); + i++; + } while ((status & LPC_OTG_I2C_STATUS_TDI) == 0 || i < 100000); + + bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, LPC_OTG_I2C_STATUS, + LPC_OTG_I2C_STATUS_TDI); +} + +static __inline void +lpc_isp3101_clear(struct ohci_softc *sc, int reg, int value) +{ + lpc_isp3101_write(sc, (reg | LPC_ISP3101_REG_CLEAR_ADDR), value); +} + +static void +lpc_isp3101_configure(device_t dev, struct ohci_softc *sc) +{ + lpc_isp3101_clear(sc, LPC_ISP3101_MODE_CONTROL_1, LPC_ISP3101_MC1_UART_EN); + lpc_isp3101_clear(sc, LPC_ISP3101_MODE_CONTROL_1, ~LPC_ISP3101_MC1_SPEED_REG); + lpc_isp3101_write(sc, LPC_ISP3101_MODE_CONTROL_1, LPC_ISP3101_MC1_SPEED_REG); + lpc_isp3101_clear(sc, LPC_ISP3101_MODE_CONTROL_2, ~0); + lpc_isp3101_write(sc, LPC_ISP3101_MODE_CONTROL_2, + (LPC_ISP3101_MC2_BI_DI | LPC_ISP3101_MC2_PSW_EN + | LPC_ISP3101_MC2_SPD_SUSP_CTRL)); + + lpc_isp3101_clear(sc, LPC_ISP3101_OTG_CONTROL_1, ~0); + lpc_isp3101_write(sc, LPC_ISP3101_MODE_CONTROL_1, LPC_ISP3101_MC1_DAT_SE0); + lpc_isp3101_write(sc, LPC_ISP3101_OTG_CONTROL_1, + (LPC_ISP3101_OTG1_DM_PULLDOWN | LPC_ISP3101_OTG1_DP_PULLDOWN)); + + lpc_isp3101_clear(sc, LPC_ISP3101_OTG_CONTROL_1, + (LPC_ISP3101_OTG1_DM_PULLUP | LPC_ISP3101_OTG1_DP_PULLUP)); + + lpc_isp3101_clear(sc, LPC_ISP3101_OTG_INTR_LATCH, ~0); + lpc_isp3101_clear(sc, LPC_ISP3101_OTG_INTR_FALLING, ~0); + lpc_isp3101_clear(sc, LPC_ISP3101_OTG_INTR_RISING, ~0); + + device_printf(dev, + "ISP3101 PHY \n", + (lpc_isp3101_read(sc, 0x00) | (lpc_isp3101_read(sc, 0x01) << 8)), + (lpc_isp3101_read(sc, 0x03) | (lpc_isp3101_read(sc, 0x04) << 8)), + (lpc_isp3101_read(sc, 0x14) | (lpc_isp3101_read(sc, 0x15) << 8))); +} + +static int lpc_ohci_detach(device_t dev) { return (0); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_pwr.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include struct lpc_pwr_softc { device_t dp_dev; @@ -50,6 +51,8 @@ bus_space_handle_t dp_bsh; }; +static struct lpc_pwr_softc *lpc_pwr_sc = NULL; + static int lpc_pwr_probe(device_t); static int lpc_pwr_attach(device_t); @@ -88,17 +91,21 @@ sc->dp_bst = rman_get_bustag(sc->dp_mem_res); sc->dp_bsh = rman_get_bushandle(sc->dp_mem_res); - /* Enable Timer0 and Timer1 */ - lpc_pwr_write_4(sc, LPC_CLKPWR_TIMCLK_CTRL1, - LPC_CLKPWR_TIMCLK_CTRL1_TIMER0 | - LPC_CLKPWR_TIMCLK_CTRL1_TIMER1); + lpc_pwr_sc = sc; + + return (0); +} - /* Enable Ethernet controller */ - lpc_pwr_write_4(sc, LPC_CLKPWR_MACCLK_CTRL, - 0x1f); - /* XXX */ +uint32_t +lpc_pwr_read(device_t dev, int reg) +{ + return (lpc_pwr_read_4(lpc_pwr_sc, reg)); +} - return (0); +void +lpc_pwr_write(device_t dev, int reg, uint32_t value) +{ + lpc_pwr_write_4(lpc_pwr_sc, reg, value); } static device_method_t lpc_pwr_methods[] = { ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_timer.c#2 (text+ko) ==== @@ -41,13 +41,12 @@ #include #include -#include - #include #include #include #include +#include struct lpc_timer_softc { device_t lt_dev; @@ -150,6 +149,11 @@ return (ENXIO); } + /* Enable timer clock */ + lpc_pwr_write(dev, LPC_CLKPWR_TIMCLK_CTRL1, + LPC_CLKPWR_TIMCLK_CTRL1_TIMER0 | + LPC_CLKPWR_TIMCLK_CTRL1_TIMER1); + /* Get PERIPH_CLK encoded in parent bus 'bus-frequency' property */ node = ofw_bus_get_node(dev); if (OF_getprop(OF_parent(node), "bus-frequency", &freq, ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#2 (text+ko) ==== @@ -116,6 +116,21 @@ #define LPC_CLKPWR_START_APR_PIN 0x3c #define LPC_CLKPWR_START_APR_INT 0x2c #define LPC_CLKPWR_USB_CTRL 0x64 +#define LPC_CLKPWR_USB_CTRL_SLAVE_HCLK (1 << 24) +#define LPC_CLKPWR_USB_CTRL_I2C_EN (1 << 23) +#define LPC_CLKPWR_USB_CTRL_DEV_NEED_CLK_EN (1 << 22) +#define LPC_CLKPWR_USB_CTRL_HOST_NEED_CLK_EN (1 << 21) +#define LPC_CLKPWR_USB_CTRL_BUSKEEPER (1 << 19) +#define LPC_CLKPWR_USB_CTRL_CLK_EN2 (1 << 18) +#define LPC_CLKPWR_USB_CTRL_CLK_EN1 (1 << 17) +#define LPC_CLKPWR_USB_CTRL_PLL_PDOWN (1 << 16) +#define LPC_CLKPWR_USB_CTRL_BYPASS (1 << 15) +#define LPC_CLKPWR_USB_CTRL_DIRECT_OUT (1 << 14) +#define LPC_CLKPWR_USB_CTRL_FEEDBACK (1 << 13) +#define LPC_CLKPWR_USB_CTRL_POSTDIV(_x) ((_x & 0x3) << 11) +#define LPC_CLKPWR_USB_CTRL_PREDIV(_x) ((_x & 0x3) << 9) +#define LPC_CLKPWR_USB_CTRL_FDBKDIV(_x) (((_x-1) & 0xff) << 1) +#define LPC_CLKPWR_USB_CTRL_PLL_LOCK (1 << 0) #define LPC_CLKPWR_USBDIV_CTRL 0x1c #define LPC_CLKPWR_MS_CTRL 0x80 #define LPC_CLKPWR_DMACLK_CTRL 0xe8 @@ -145,5 +160,157 @@ #define LPC_CLKPWR_POS0_IRAM_CTRL 0x110 #define LPC_CLKPWR_POS1_IRAM_CTRL 0x114 +/* + * Real time clock. (from UM10326: LPC32x0 User manual, page 566) + */ +#define LPC_RTC_UCOUNT 0x00 +#define LPC_RTC_DCOUNT 0x04 +#define LPC_RTC_MATCH0 0x08 +#define LPC_RTC_MATCH1 0x0c +#define LPC_RTC_CTRL 0x10 +#define LPC_RTC_CTRL_ONSW (1 << 7) +#define LPC_RTC_CTRL_DISABLE (1 << 6) +#define LPC_RTC_CTRL_RTCRESET (1 << 4) +#define LPC_RTC_CTRL_MATCH0ONSW (1 << 3) +#define LPC_RTC_CTRL_MATCH1ONSW (1 << 2) +#define LPC_RTC_CTRL_MATCH1INTR (1 << 1) +#define LPC_RTC_CTRL_MATCH0INTR (1 << 0) +#define LPC_RTC_INTSTAT 0x14 +#define LPC_RTC_KEY 0x18 +#define LPC_RTC_SRAM_BEGIN 0x80 +#define LPC_RTC_SRAM_END 0xff + +/* + * MMC/SD controller. (from UM10326: LPC32x0 User manual, page 436) + */ +#define LPC_SD_POWER 0x8000 +#define LPC_SD_CLOCK 0x8004 +#define LPC_SD_ARGUMENT 0x8008 +#define LPC_SD_COMMAND 0x800c +#define LPC_SD_COMMAND_ENABLE (1 << 10) +#define LPC_SD_COMMAND_PENDING (1 << 9) +#define LPC_SD_COMMAND_INTERRUPT (1 << 8) +#define LPC_SD_COMMAND_LONGRSP (1 << 7) +#define LPC_SD_COMMAND_RESPONSE (1 << 6) +#define LPC_SD_COMMAND_CMDINDEXMASK 0x1f +#define LPC_SD_RESPCMD 0x8010 +#define LPC_SD_RESP0 0x8014 +#define LPC_SD_RESP1 0x8018 +#define LPC_SD_RESP2 0x801c +#define LPC_SD_RESP3 0x8020 +#define LPC_SD_DATATIMER 0x8024 +#define LPC_SD_DATALENGTH 0x8028 +#define LPC_SD_DATACTRL 0x802c +#define LPC_SD_DATACTRL_BLOCKSIZESHIFT 4 +#define LPC_SD_DATACTRL_BLOCKSIZEMASK 0xf +#define LPC_SD_DATACTRL_DMAENABLE (1 << 3) +#define LPC_SD_DATACTRL_MODE (1 << 2) +#define LPC_SD_DATACTRL_DIRECTION (1 << 1) +#define LPC_SD_DATACTRL_ENABLE (1 << 0) +#define LPC_SD_DATACNT 0x8030 +#define LPC_SD_STATUS 0x8034 +#define LPC_SD_STATUS_RXDATAAVLBL (1 << 21) +#define LPC_SD_STATUS_TXDATAAVLBL (1 << 20) +#define LPC_SD_STATUS_RXFIFOEMPTY (1 << 19) +#define LPC_SD_STATUS_TXFIFOEMPTY (1 << 18) +#define LPC_SD_STATUS_RXFIFOFULL (1 << 17) +#define LPC_SD_STATUS_TXFIFOFULL (1 << 16) +#define LPC_SD_STATUS_RXFIFOHALFFULL (1 << 15) +#define LPC_SD_STATUS_TXFIFOHALFEMPTY (1 << 14) +#define LPC_SD_STATUS_RXACTIVE (1 << 13) +#define LPC_SD_STATUS_TXACTIVE (1 << 12) +#define LPC_SD_CLEAR 0x8038 +#define LPC_SD_MASK0 0x803c +#define LPC_SD_MASK1 0x8040 +#define LPC_SD_FIFOCNT 0x8048 +#define LPC_SD_FIFO 0x8080 + +/* + * USB OTG controller (from UM10326: LPC32x0 User manual, page 410) + */ +#define LPC_OTG_INT_STATUS 0x100 +#define LPC_OTG_INT_ENABLE 0x104 +#define LPC_OTG_INT_SET 0x108 +#define LPC_OTG_INT_CLEAR 0x10c +#define LPC_OTG_STATUS 0x110 +#define LPC_OTG_STATUS_ATOB_HNP_TRACK (1 << 9) +#define LPC_OTG_STATUS_BTOA_HNP_TACK (1 << 8) +#define LPC_OTG_STATUS_TRANSP_I2C_EN (1 << 7) +#define LPC_OTG_STATUS_TIMER_RESET (1 << 6) +#define LPC_OTG_STATUS_TIMER_EN (1 << 5) +#define LPC_OTG_STATUS_TIMER_MODE (1 << 4) +#define LPC_OTG_STATUS_TIMER_SCALE (1 << 2) +#define LPC_OTG_STATUS_HOST_EN (1 << 0) +#define LPC_OTG_TIMER 0x114 +#define LPC_OTG_I2C_TXRX 0x300 +#define LPC_OTG_I2C_STATUS 0x304 +#define LPC_OTG_I2C_STATUS_TFE (1 << 11) +#define LPC_OTG_I2C_STATUS_TFF (1 << 10) +#define LPC_OTG_I2C_STATUS_RFE (1 << 9) +#define LPC_OTG_I2C_STATUS_RFF (1 << 8) +#define LPC_OTG_I2C_STATUS_SDA (1 << 7) +#define LPC_OTG_I2C_STATUS_SCL (1 << 6) +#define LPC_OTG_I2C_STATUS_ACTIVE (1 << 5) +#define LPC_OTG_I2C_STATUS_DRSI (1 << 4) +#define LPC_OTG_I2C_STATUS_DRMI (1 << 3) +#define LPC_OTG_I2C_STATUS_NAI (1 << 2) +#define LPC_OTG_I2C_STATUS_AFI (1 << 1) +#define LPC_OTG_I2C_STATUS_TDI (1 << 0) +#define LPC_OTG_I2C_CTRL 0x308 +#define LPC_OTG_I2C_CTRL_SRST (1 << 8) +#define LPC_OTG_I2C_CTRL_TFFIE (1 << 7) +#define LPC_OTG_I2C_CTRL_RFDAIE (1 << 6) +#define LPC_OTG_I2C_CTRL_RFFIE (1 << 5) +#define LPC_OTG_I2C_CTRL_DRSIE (1 << 4) +#define LPC_OTG_I2C_CTRL_DRMIE (1 << 3) +#define LPC_OTG_I2C_CTRL_NAIE (1 << 2) +#define LPC_OTG_I2C_CTRL_AFIE (1 << 1) +#define LPC_OTG_I2C_CTRL_TDIE (1 << 0) +#define LPC_OTG_I2C_CLKHI 0x30c +#define LPC_OTG_I2C_CLKLO 0x310 +#define LPC_OTG_CLOCK_CTRL 0xff4 +#define LPC_OTG_CLOCK_CTRL_AHB_EN (1 << 4) +#define LPC_OTG_CLOCK_CTRL_OTG_EN (1 << 3) +#define LPC_OTG_CLOCK_CTRL_I2C_EN (1 << 2) +#define LPC_OTG_CLOCK_CTRL_DEV_EN (1 << 1) +#define LPC_OTG_CLOCK_CTRL_HOST_EN (1 << 0) +#define LPC_OTG_CLOCK_STATUS 0xff8 + +/* + * ISP3101 USB transceiver registers + */ +#define LPC_ISP3101_I2C_ADDR 0x2d +#define LPC_ISP3101_MODE_CONTROL_1 0x04 +#define LPC_ISP3101_MC1_SPEED_REG (1 << 0) +#define LPC_ISP3101_MC1_SUSPEND_REG (1 << 1) +#define LPC_ISP3101_MC1_DAT_SE0 (1 << 2) +#define LPC_ISP3101_MC1_TRANSPARENT (1 << 3) +#define LPC_ISP3101_MC1_BDIS_ACON_EN (1 << 4) +#define LPC_ISP3101_MC1_OE_INT_EN (1 << 5) +#define LPC_ISP3101_MC1_UART_EN (1 << 6) +#define LPC_ISP3101_MODE_CONTROL_2 0x12 +#define LPC_ISP3101_MC2_GLOBAL_PWR_DN (1 << 0) +#define LPC_ISP3101_MC2_SPD_SUSP_CTRL (1 << 1) +#define LPC_ISP3101_MC2_BI_DI (1 << 2) +#define LPC_ISP3101_MC2_TRANSP_BDIR0 (1 << 3) +#define LPC_ISP3101_MC2_TRANSP_BDIR1 (1 << 4) +#define LPC_ISP3101_MC2_AUDIO_EN (1 << 5) +#define LPC_ISP3101_MC2_PSW_EN (1 << 6) +#define LPC_ISP3101_MC2_EN2V7 (1 << 7) +#define LPC_ISP3101_OTG_CONTROL_1 0x06 +#define LPC_ISP3101_OTG1_DP_PULLUP (1 << 0) +#define LPC_ISP3101_OTG1_DM_PULLUP (1 << 1) +#define LPC_ISP3101_OTG1_DP_PULLDOWN (1 << 2) +#define LPC_ISP3101_OTG1_DM_PULLDOWN (1 << 3) +#define LPC_ISP3101_OTG1_ID_PULLDOWN (1 << 4) +#define LPC_ISP3101_OTG1_VBUS_DRV (1 << 5) +#define LPC_ISP3101_OTG1_VBUS_DISCHRG (1 << 6) +#define LPC_ISP3101_OTG1_VBUS_CHRG (1 << 7) +#define LPC_ISP3101_OTG_CONTROL_2 0x10 +#define LPC_ISP3101_OTG_INTR_LATCH 0x0a +#define LPC_ISP3101_OTG_INTR_FALLING 0x0c +#define LPC_ISP3101_OTG_INTR_RISING 0x0e +#define LPC_ISP3101_REG_CLEAR_ADDR 0x01 + #endif /* _ARM_LPC_LPCREG_H */ ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2010 Semihalf, Jakub Klama + * Copyright (c) 2011 Jakub Wojciech Klama * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,31 +24,14 @@ * SUCH DAMAGE. */ -#ifndef _ARM_DAVINCI_DAVINCIVAR_H -#define _ARM_DAVINCI_DAVINCIVAR_H +#ifndef _ARM_LPC_LPCVAR_H +#define _ARM_LPC_LPCVAR_H #include #include #include -struct obio_device { - const char * od_name; - u_long od_base; - u_long od_size; - int od_irqs[7]; - /* PSC controller module numbers */ - int od_psc[7]; - /* EDMA channel numbers */ - int od_edma[7]; -}; +uint32_t lpc_pwr_read(device_t, int); +void lpc_pwr_write(device_t, int, uint32_t); -#define DAVINCI_SYSCLK1 1 -#define DAVINCI_SYSCLK2 2 -#define DAVINCI_SYSCLK3 3 -#define DAVINCI_SYSCLK5 5 -uint32_t davinci_sysclk(int); - -extern struct obio_device davinci_devices[]; -extern bus_space_tag_t obio_tag; - -#endif /* _ARM_DAVINCI_DAVINCIVAR_H */ +#endif /* _ARM_LPC_LPCVAR_H */ ==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 6 06:59:19 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC2D31065670; Wed, 6 Jul 2011 06:59:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6403A106566B for ; Wed, 6 Jul 2011 06:59:19 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4FD498FC08 for ; Wed, 6 Jul 2011 06:59:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p666xJQ5010628 for ; Wed, 6 Jul 2011 06:59:19 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p666xAWc010623 for perforce@freebsd.org; Wed, 6 Jul 2011 06:59:10 GMT (envelope-from lz@FreeBSD.org) Date: Wed, 6 Jul 2011 06:59:10 GMT Message-Id: <201107060659.p666xAWc010623@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 06:59:19 -0000 http://p4web.freebsd.org/@@195797?ac=10 Change 195797 by lz@lz-freebsd-dev on 2011/07/06 06:58:54 IFC. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/sys_machdep.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/clock.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/amd64/pci/pci_bus.c#3 delete .. //depot/projects/soc2010/extfs/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/at91/at91_machdep.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/include/_types.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/Makefile.amd64#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/Makefile.arm#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/Makefile.powerpc#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/disk.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/common/disk.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/common/interp.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/load_elf.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/load_elf_obj.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ficl/amd64/sysdep.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/ficl/amd64/sysdep.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/forth/beastie.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/brand.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/brand.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/check-password.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/check-password.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/color.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/color.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/delay.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/delay.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/forth/menu-commands.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/menu.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/menu.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/menu.rc#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/shortcuts.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/forth/version.4th#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/forth/version.4th.8#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/i386/zfsboot/Makefile#6 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/i386/zfsboot/zfsldr.S#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/common/exec.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/common/icache.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/common/libia64.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/efi/efimd.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/powerpc/ps3/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/ficl/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/libstand/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/libstand/amd64/_setjmp.S#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/test/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/test/test.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/autoload.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/bootinfo.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/bootinfo32.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/bootinfo64.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/conf.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/copy.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/devicename.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/elf32_freebsd.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/elf64_freebsd.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/host.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/libuserboot.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/main.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/userboot_cons.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/userboot_disk.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/boot/userboot/userboot/version#1 branch .. //depot/projects/soc2010/extfs/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/ata/ata_da.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/systm.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/dev/cyclic/cyclic.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_videodev.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_videodev2.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/compat/linux/linux_videodev2_compat.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/Makefile.sun4v#2 delete .. //depot/projects/soc2010/extfs/src/sys/conf/NOTES#6 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files#8 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.i386#6 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.pc98#6 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/files.sun4v#4 delete .. //depot/projects/soc2010/extfs/src/sys/conf/kern.mk#6 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/options#7 integrate .. //depot/projects/soc2010/extfs/src/sys/conf/options.sun4v#2 delete .. //depot/projects/soc2010/extfs/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/changes.txt#7 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbinput.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbutils.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/debugger/dbxface.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acconfig.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acdebug.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acglobal.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/aclocal.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acpiosxf.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acpixf.h#7 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/include/acpredef.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/if_pflow.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_lb.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_mtag.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_osfp.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_ruleset.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_subr.c#2 delete .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/age/if_age.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ahci/ahci.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/alc/if_alc.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/alc/if_alcreg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ale/if_ale.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ale/if_alereg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/amdsbwd/amdsbwd.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ata/chipsets/ata-intel.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_dfs/null/dfs_null.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah.h#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_debug.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_desc.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_devid.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_9287.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_9287.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_internal.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9285an.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287.ini#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287an.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_hal/ar9002/ar9287phy.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_ahb.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_sysctl.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_ath_tx_ht.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athdfs.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/atkbdc/atkbdreg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bxe/bxe_debug.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bxe/bxe_link.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bxe/if_bxe.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/bxe/if_bxe.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/adapter.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/common/common.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/common/jhash.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/common/t4fw_interface.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/offload.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/osdep.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/t4_ioctl.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/t4_l2t.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/t4_l2t.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/t4_main.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/cxgbe/t4_sge.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/dc/pnphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/e1000/if_igb.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/et/if_et.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/glxiic/glxiic.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iicbus/ad7417.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/iicbus/ds1775.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iicbus/max6690.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/iwn/if_iwnvar.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ixgbe/README#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ixgbe/ixv.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/md/md.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/atphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/axphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/exphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/icsphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/jmphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/mii.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/miivar.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/nsphyter.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/pnaphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/rdcphy.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/rlswitch.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/smcphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/truephy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mii/xmphy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/mvs/mvs.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/null/null.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pci/pci_subr.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/pty/pty.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sdhci/sdhci.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sf/if_sf.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sis/if_sis.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sound/macio/i2s.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/controller/xhci_pci.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/controller/xhcireg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/input/uep.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_ipheth.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_mos.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/quirk/usb_quirk.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umcs.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umcs.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_audio.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_kbd.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_modem.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_mouse.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_freebsd.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vr/if_vrreg.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vte/if_vte.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vxge/include/build-version.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vxge/vxge.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/vxge/vxge.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xen/balloon/balloon.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xen/control/control.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xen/netfront/netfront.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/dev/xl/if_xlreg.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#17 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfs.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfs_commonsubs.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfs/nfsproto.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clcomsubs.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clkdtrace.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clnfsiod.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdcache.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdserv.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/cache/g_cache.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/eli/g_eli_integrity.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/eli/g_eli_key_cache.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_disk.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_dump.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_event.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_map.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/mountver/g_mountver.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/multipath/g_multipath.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_ebr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_mbr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/sched/g_sched.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/clock.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/include/xen/xenvar.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/pci/pci_bus.c#4 delete .. //depot/projects/soc2010/extfs/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/xen/clock.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/pal.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/include/ia64_cpu.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/include/smp.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/isa/isa_common.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/isa/isa_common.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/device_if.m#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_clocksource.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_racct.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_rctl.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/ksched.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_sbuf.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/sys_capability.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/tty.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/soc2010/extfs/src/sys/kgssapi/gss_impl.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_chip.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_gpio.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_gpiovar.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_ohci.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar71xx_setup.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar724x_chip.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar724xreg.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar91xx_chip.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/ar91xxreg.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/atheros/if_arge.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/cavium/octe/octe.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/cavium/octeon_ebt3000_cf.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/cavium/octeon_mp.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/ALCHEMY#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/AR71XX#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/AR91XX_BASE#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/MALTA64#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/OCTEON1#6 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/PB92#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/PB92.hints#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/RT305X#2 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/XLR#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/XLR64#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/XLRN32#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/conf/std.SWARM#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/idt/if_kr.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/_types.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/atomic.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/hwfunc.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/pmap.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/include/vmparam.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/mips/mp_machdep.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/rmi/fmn.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/rmi/iodi.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/rmi/xlr_machdep.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/mips/sibyte/sb_scd.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/Makefile#6 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/ath/Makefile#6 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/cxgbe/if_cxgbe/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/dtrace/dtnfscl/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/glxiic/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/modules/ipdivert/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/kgssapi_krb5/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/mem/Makefile#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/nfscl/Makefile#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/nfscommon/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/pfsync/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/usb/Makefile#4 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/usb/template/Makefile#2 integrate .. //depot/projects/soc2010/extfs/src/sys/modules/usb/umcs/Makefile#1 branch .. //depot/projects/soc2010/extfs/src/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_debug.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_epair.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_gif.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_gre.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_llatbl.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_media.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_spppfr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_stf.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_tun.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net/if_var.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net/netisr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/net/netisr.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/netisr_internal.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net/route.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/net/route.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_alq.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/netflow/netflow_v9.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in_pcbgroup.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_dn_glue.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_dn_io.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/alias_sctp.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_cc_functions.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/siftr.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_lro.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_pcbgroup.c#1 branch .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/send.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/netipsec/key.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfs/bootp_subr.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfs/nfs_diskless.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfs/nfs_kdtrace.h#1 branch .. //depot/projects/soc2010/extfs/src/sys/nfs/nfs_nfssvc.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfs/nfssvc.h#4 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_kdtrace.h#2 delete .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsclient/nfsargs.h#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/ofed/include/linux/list.h#2 integrate .. //depot/projects/soc2010/extfs/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2010/extfs/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/copyinout.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/interrupt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/locore32.S#2 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/locore64.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/moea64_native.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/ofwmagic.S#2 delete .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/slb.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/swtch32.S#2 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/swtch64.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/trap_subr32.S#2 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/aim/trap_subr64.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/copyinout.c#2 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/platform_bare.c#4 integrate .. //depot/projects/soc2010/extfs/src/sys/powerpc/booke/pmap.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 6 08:23:19 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770FC1065675; Wed, 6 Jul 2011 08:23:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27D5D106566C for ; Wed, 6 Jul 2011 08:23:19 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 13B308FC18 for ; Wed, 6 Jul 2011 08:23:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p668NILG029212 for ; Wed, 6 Jul 2011 08:23:18 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p668NFG1029209 for perforce@freebsd.org; Wed, 6 Jul 2011 08:23:15 GMT (envelope-from lz@FreeBSD.org) Date: Wed, 6 Jul 2011 08:23:15 GMT Message-Id: <201107060823.p668NFG1029209@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 08:23:19 -0000 http://p4web.freebsd.org/@@195801?ac=10 Change 195801 by lz@lz-freebsd-dev on 2011/07/06 08:22:52 IFC. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/sys_machdep.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/clock.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/amd64/pci/pci_bus.c#3 delete .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/at91/at91_machdep.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/_types.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/Makefile.amd64#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/Makefile.arm#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/Makefile.powerpc#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/disk.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/disk.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/interp.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/load_elf.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/load_elf_obj.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ficl/amd64/sysdep.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/ficl/amd64/sysdep.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/beastie.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/brand.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/brand.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/check-password.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/check-password.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/color.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/color.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/delay.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/delay.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/menu-commands.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/menu.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/menu.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/menu.rc#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/shortcuts.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/version.4th#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/forth/version.4th.8#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/zfsboot/Makefile#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/i386/zfsboot/zfsldr.S#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/common/exec.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/common/icache.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/common/libia64.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/efi/efimd.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/powerpc/ps3/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/ficl/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/libstand/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/libstand/amd64/_setjmp.S#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/test/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/test/test.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/autoload.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/bootinfo.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/bootinfo32.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/bootinfo64.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/conf.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/copy.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/devicename.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/elf32_freebsd.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/elf64_freebsd.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/host.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/libuserboot.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/main.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/userboot_cons.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/userboot_disk.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/boot/userboot/userboot/version#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/ata/ata_da.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/systm.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/dev/cyclic/cyclic.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_videodev.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_videodev2.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/compat/linux/linux_videodev2_compat.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/Makefile.sun4v#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/conf/NOTES#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.i386#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.pc98#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/files.sun4v#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/conf/kern.mk#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/options#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/conf/options.sun4v#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/changes.txt#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbinput.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbutils.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/debugger/dbxface.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acconfig.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acdebug.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acglobal.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/aclocal.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acpiosxf.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acpixf.h#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/include/acpredef.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/if_pflow.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_lb.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_mtag.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_osfp.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_ruleset.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_subr.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/age/if_age.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ahci/ahci.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/alc/if_alc.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/alc/if_alcreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ale/if_ale.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ale/if_alereg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/amdsbwd/amdsbwd.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ata/chipsets/ata-intel.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_dfs/null/dfs_null.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah.h#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_debug.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_desc.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_devid.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_9287.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_9287.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_internal.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9285an.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287.ini#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_olc.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287_reset.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287an.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_hal/ar9002/ar9287phy.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/ath_rate/sample/tx_schedules.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_ahb.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_sysctl.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_sysctl.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_ath_tx_ht.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athdfs.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/atkbdc/atkbdreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bxe/bxe_debug.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bxe/bxe_link.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bxe/if_bxe.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/bxe/if_bxe.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/adapter.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/common/common.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/common/jhash.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/common/t4fw_interface.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/offload.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/osdep.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/t4_ioctl.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/t4_l2t.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/t4_l2t.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/t4_main.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/cxgbe/t4_sge.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/dc/dcphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/dc/pnphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/e1000/if_igb.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/et/if_et.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/glxiic/glxiic.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iicbus/ad7417.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/iicbus/ds1775.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iicbus/max6690.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/iwn/if_iwnvar.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ixgbe/README#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ixgbe/ixv.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/md/md.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/acphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/amphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/atphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/axphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/exphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/icsphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/jmphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/lxtphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/mii.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/miivar.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/nsgphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/nsphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/nsphyter.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/pnaphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/qsphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rdcphy.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/rlswitch.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/smcphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/truephy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mii/xmphy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/mvs/mvs.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/null/null.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/pci_subr.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/pty/pty.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sdhci/sdhci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sf/if_sf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sis/if_sis.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/macio/i2s.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/xhci_pci.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/controller/xhcireg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/input/uep.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_ipheth.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_mos.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/quirk/usb_quirk.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umcs.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umcs.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_audio.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_kbd.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_modem.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_mouse.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_freebsd.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vr/if_vrreg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vte/if_vte.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vxge/include/build-version.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vxge/vxge.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/vxge/vxge.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/balloon/balloon.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/control/control.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xen/netfront/netfront.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/dev/xl/if_xlreg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_htree.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#21 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/htree.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#5 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfs.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfs_commonsubs.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfs/nfsproto.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clcomsubs.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clkdtrace.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clnfsiod.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdcache.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdport.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdserv.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/cache/g_cache.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/eli/g_eli_integrity.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/eli/g_eli_key_cache.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_disk.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_dump.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_event.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_map.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/mountver/g_mountver.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/multipath/g_multipath.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_ebr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_mbr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/sched/g_sched.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/clock.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/include/xen/xenvar.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/pci/pci_bus.c#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/xen/clock.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/pal.S#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/include/ia64_cpu.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/include/smp.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/isa/isa_common.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/isa/isa_common.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/device_if.m#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_clocksource.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_racct.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_rctl.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/ksched.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_msgbuf.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_sbuf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/sys_capability.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/tty.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/kgssapi/gss_impl.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_chip.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_gpio.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_gpiovar.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_machdep.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_ohci.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar71xx_setup.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar724x_chip.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar724xreg.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar91xx_chip.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/ar91xxreg.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/atheros/if_arge.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octe/octe.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octeon_ebt3000_cf.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/cavium/octeon_mp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/ALCHEMY#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/AR71XX#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/AR91XX_BASE#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/MALTA64#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/OCTEON1#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/PB92#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/PB92.hints#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/RT305X#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/XLR#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/XLR64#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/XLRN32#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/conf/std.SWARM#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/idt/if_kr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/_types.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/atomic.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/hwfunc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/pmap.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/include/vmparam.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/mp_machdep.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/fmn.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/iodi.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/rmi/xlr_machdep.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/mips/sibyte/sb_scd.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/Makefile#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/ath/Makefile#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/cxgbe/if_cxgbe/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/dtrace/dtnfscl/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/glxiic/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/ipdivert/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/kgssapi_krb5/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/mem/Makefile#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/nfscl/Makefile#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/nfscommon/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/pfsync/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/usb/Makefile#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/usb/template/Makefile#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/modules/usb/umcs/Makefile#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_debug.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_epair.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_gif.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_gre.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_llatbl.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_media.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_spppfr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_stf.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_tun.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/if_var.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/netisr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/netisr.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/netisr_internal.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/route.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net/route.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_alq.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/netflow/netflow_v9.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_pcbgroup.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_dn_glue.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_dn_io.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/alias_sctp.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_cc_functions.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/siftr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_lro.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_pcbgroup.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/send.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netipsec/key.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfs/bootp_subr.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfs/nfs_diskless.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfs/nfs_kdtrace.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/nfs/nfs_nfssvc.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfs/nfssvc.h#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_kdtrace.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsclient/nfsargs.h#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/ofed/include/linux/list.h#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/copyinout.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/interrupt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/locore32.S#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/locore64.S#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/moea64_native.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/ofwmagic.S#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/slb.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/swtch32.S#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/swtch64.S#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/trap_subr32.S#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/aim/trap_subr64.S#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/booke/copyinout.c#2 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/booke/interrupt.c#3 integrate .. //depot/projects/soc2010/ext4fs/src/sys/powerpc/booke/locore.S#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 7 07:43:34 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C086A1065674; Thu, 7 Jul 2011 07:43:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79DC61065672 for ; Thu, 7 Jul 2011 07:43:33 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 68B5E8FC14 for ; Thu, 7 Jul 2011 07:43:33 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p677hXVP011151 for ; Thu, 7 Jul 2011 07:43:33 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p677hXv9011148 for perforce@freebsd.org; Thu, 7 Jul 2011 07:43:33 GMT (envelope-from cnicutar@freebsd.org) Date: Thu, 7 Jul 2011 07:43:33 GMT Message-Id: <201107070743.p677hXv9011148@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2011 07:43:34 -0000 http://p4web.freebsd.org/@@195838?ac=10 Change 195838 by cnicutar@cnicutar_cronos on 2011/07/07 07:43:12 Send UTO on SYN and on the first non-SYN segment sent (as advised by RFC 5482, sections 3 and 4.1). Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#6 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#5 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_output.c#6 (text+ko) ==== @@ -705,9 +705,16 @@ } } /* UTO */ - if ((flags & TH_SYN) && (tp->t_flags & TF_SND_UTO)) { + if (tp->t_flags & TF_SND_UTO) { to.to_uto = tp->snd_uto; to.to_flags |= TOF_UTO; + /* + * The option is sent with the SYN and with the first + * non-SYN segment. + */ + if (!(flags & TH_SYN)) + tp->t_flags &= ~TF_SND_UTO; + } #ifdef TCP_SIGNATURE /* TCP-MD5 (RFC2385). */ ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#5 (text+ko) ==== @@ -305,8 +305,7 @@ return; } callout_deactivate(&tp->t_timers->tt_keep); - if ((tp->t_flags & TF_SND_UTO) || ((tp->t_flags & TF_RCV_UTO) && - tp->rcv_uto)) { + if ((tp->snd_uto) || ((tp->t_flags & TF_RCV_UTO) && tp->rcv_uto)) { /* * This connection is using UTO (either sending or has * received a value). We need to stop sending keepalives @@ -493,8 +492,7 @@ /* UTO starting again since it's the first retransmit. */ tp->t_suto = 0; - if ((tp->t_flags & TF_SND_UTO) || ((tp->t_flags & TF_RCV_UTO) && - tp->rcv_uto)) { + if (tp->snd_uto || ((tp->t_flags & TF_RCV_UTO) && tp->rcv_uto)) { /* * Since we're using UTO for this connection we need to * compute how much time we've got left. From owner-p4-projects@FreeBSD.ORG Thu Jul 7 08:04:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54476106566C; Thu, 7 Jul 2011 08:04:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09087106564A for ; Thu, 7 Jul 2011 08:04:18 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EC0A98FC0A for ; Thu, 7 Jul 2011 08:04:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6784HAp014872 for ; Thu, 7 Jul 2011 08:04:17 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6784Hvo014869 for perforce@freebsd.org; Thu, 7 Jul 2011 08:04:17 GMT (envelope-from cnicutar@freebsd.org) Date: Thu, 7 Jul 2011 08:04:17 GMT Message-Id: <201107070804.p6784Hvo014869@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2011 08:04:18 -0000 http://p4web.freebsd.org/@@195839?ac=10 Change 195839 by cnicutar@cnicutar_cronos on 2011/07/07 08:04:15 Change @195682 caused the retransmit timer to wait more than needed when the timeout is less then TCP_MAXRXTHISTFT retransmits. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#6 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/sys/netinet/tcp_timer.c#6 (text+ko) ==== @@ -557,8 +557,10 @@ rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; else /* We're in UTO, back off as much as we can. */ - rexmt = min(TCPTV_REXMTMAX, uto_left * hz); + rexmt = TCPTV_REXMTMAX; } + /* We might want to wait less than an entire backoff. */ + rexmt = min(rexmt, uto_left * hz); TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX); /* From owner-p4-projects@FreeBSD.ORG Sat Jul 9 08:56:13 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A67651065678; Sat, 9 Jul 2011 08:56:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D989106566B for ; Sat, 9 Jul 2011 08:56:13 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4ACF28FC13 for ; Sat, 9 Jul 2011 08:56:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p698uDss043134 for ; Sat, 9 Jul 2011 08:56:13 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p698uDS1043125 for perforce@freebsd.org; Sat, 9 Jul 2011 08:56:13 GMT (envelope-from ilya@FreeBSD.org) Date: Sat, 9 Jul 2011 08:56:13 GMT Message-Id: <201107090856.p698uDS1043125@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2011 08:56:13 -0000 http://p4web.freebsd.org/@@195923?ac=10 Change 195923 by ilya@ilya_triton2011 on 2011/07/09 08:55:40 Save root vnode reference Add fuse_isvalid_attr Add sysctls to control data cache and mmap Add debug messages, remove unused code Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/config.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#13 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.h#5 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#16 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#16 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#14 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#7 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#11 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_kernel.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#7 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#14 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#14 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_param.h#4 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#19 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#35 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/config.h#2 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#13 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#9 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#11 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.h#5 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#16 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#16 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#14 (text+ko) ==== @@ -91,7 +91,7 @@ * we hardwire it into the file's private data (similarly to Linux, * btw.). */ - directio = (flag & O_DIRECT); + directio = (flag & O_DIRECT) || !fuse_vnode_cache_enable(vp); switch (uio->uio_rw) { case UIO_READ: ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#7 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#10 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#11 (text+ko) ==== @@ -116,6 +116,7 @@ struct fuse_data { struct cdev *fdev; struct mount *mp; + struct vnode *vroot; enum mountpri mpri; int mntco; struct ucred *daemoncred; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_kernel.h#2 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#7 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#14 (text+ko) ==== @@ -44,6 +44,14 @@ SYSCTL_INT(_vfs_fuse, OID_AUTO, node_count, CTLFLAG_RD, &fuse_node_count, 0, ""); +int fuse_data_cache_enable = 1; +SYSCTL_INT(_vfs_fuse, OID_AUTO, data_cache_enable, CTLFLAG_RW, + &fuse_data_cache_enable, 0, ""); + +int fuse_mmap_enable = 1; +SYSCTL_INT(_vfs_fuse, OID_AUTO, mmap_enable, CTLFLAG_RW, + &fuse_mmap_enable, 0, ""); + static void fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, uint64_t nodeid, enum vtype vtyp) @@ -209,6 +217,16 @@ } } +int +fuse_isvalid_attr(struct vnode *vp) +{ + struct fuse_vnode_data *fvdat = VTOFUD(vp); + struct timespec uptsp; + + nanouptime(&uptsp); + return fuse_timespec_cmp(&uptsp, &fvdat->cached_attrs_valid, <=); +} + void fuse_vnode_setsize(struct vnode *vp, off_t newsize) { ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#14 (text+ko) ==== @@ -62,6 +62,10 @@ #define FUSE_NULL_ID 0 +extern struct vop_vector fuse_vnops; +extern int fuse_data_cache_enable; +extern int fuse_mmap_enable; + static __inline__ void fuse_invalidate_attr(struct vnode *vp) @@ -71,35 +75,19 @@ } } -struct get_filehandle_param { +static __inline int +fuse_vnode_cache_enable(struct vnode *vp) +{ + return (fuse_data_cache_enable); +} - enum fuse_opcode opcode; - uint8_t do_gc:1; - uint8_t do_new:1; +static __inline int +fuse_vnode_mmap_enable(struct vnode *vp) +{ + return (fuse_mmap_enable && fuse_data_cache_enable); +} - int explicitidentity; - pid_t pid; - uid_t uid; - gid_t gid; -}; - -#define C_NEED_RVNODE_PUT 0x00001 -#define C_NEED_DVNODE_PUT 0x00002 -#define C_ZFWANTSYNC 0x00004 -#define C_FROMSYNC 0x00008 -#define C_MODIFIED 0x00010 -#define C_NOEXISTS 0x00020 -#define C_DELETED 0x00040 -#define C_HARDLINK 0x00080 -#define C_FORCEUPDATE 0x00100 -#define C_HASXATTRS 0x00200 -#define C_NEED_DATA_SETSIZE 0x01000 -#define C_NEED_RSRC_SETSIZE 0x02000 - -#define C_CREATING 0x04000 -#define C_ACCESS_NOOP 0x08000 - -extern struct vop_vector fuse_vnops; +int fuse_isvalid_attr(struct vnode *vp); void fuse_vnode_destroy(struct vnode *vp); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_param.h#4 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#19 (text+ko) ==== @@ -307,6 +307,14 @@ } /* There is 1 extra root vnode reference (mp->mnt_data). */ + FUSE_LOCK(); + if (data->vroot != NULL) { + struct vnode *vroot = data->vroot; + data->vroot = NULL; + FUSE_UNLOCK(); + vrele(vroot); + } else + FUSE_UNLOCK(); err = vflush(mp, 0, flags, td); if (err) { debug_printf("vflush failed"); @@ -352,9 +360,34 @@ static int fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp) { + struct fuse_data *data = fuse_get_mpdata(mp); int err = 0; - err = fuse_vnode_get(mp, FUSE_ROOT_ID, NULL, vpp, NULL, VDIR, 0); + if (data->vroot != NULL) { + err = vget(data->vroot, lkflags, curthread); + if (err == 0) + *vpp = data->vroot; + } else { + err = fuse_vnode_get(mp, FUSE_ROOT_ID, NULL, vpp, NULL, VDIR, 0); + if (err == 0) { + FUSE_LOCK(); + MPASS(data->vroot == NULL || data->vroot == *vpp); + if (data->vroot == NULL) { + DEBUG("new root vnode\n"); + data->vroot = *vpp; + FUSE_UNLOCK(); + vref(*vpp); + } else if (data->vroot != *vpp) { + DEBUG("root vnode race\n"); + FUSE_UNLOCK(); + VOP_UNLOCK(*vpp, 0); + vrele(*vpp); + vrecycle(*vpp, curthread); + *vpp = data->vroot; + } else + FUSE_UNLOCK(); + } + } return err; } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#35 (text+ko) ==== @@ -167,7 +167,9 @@ struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp)); - fuse_trace_printf_vnop(); + int err; + + DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { if (vnode_isvroot(vp)) { @@ -198,7 +200,9 @@ facp.facc_flags |= FACCESS_DO_ACCESS; } - return fuse_internal_access(vp, accmode, &facp, ap->a_td, ap->a_cred); + err = fuse_internal_access(vp, accmode, &facp, ap->a_td, ap->a_cred); + DEBUG2G("err=%d accmode=0x%x\n", err, accmode); + return err; } /* @@ -465,18 +469,16 @@ int err = 0; int dataflags; - struct timespec uptsp; struct fuse_dispatcher fdi; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd\n", VTOI(vp)); dataflags = fuse_get_mpdata(vnode_mount(vp))->dataflags; /* Note that we are not bailing out on a dead file system just yet. */ /* look for cached attributes */ - nanouptime(&uptsp); - if (fuse_timespec_cmp(&uptsp, &VTOFUD(vp)->cached_attrs_valid, <=)) { + if (fuse_isvalid_attr(vp)) { if (vap != VTOVA(vp)) { memcpy(vap, VTOVA(vp), sizeof(*vap)); } @@ -574,7 +576,7 @@ int type; - fuse_trace_printf_vnop(); + DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp)); for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); @@ -583,7 +585,8 @@ } } - if ((fvdat->flag & FN_REVOKED) != 0 || fuse_reclaim_inactive) { + if ((fvdat->flag & FN_REVOKED) != 0 || + (fuse_reclaim_inactive && vnode_vtype(vp) != VDIR)) { vrecycle(vp, td); } @@ -683,7 +686,8 @@ uint64_t nid; struct fuse_access_param facp; - fuse_trace_printf_vnop(); + DEBUG2G("parent_inode=%jd - %*s\n", + VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); if (fuse_isdeadfs(dvp)) { *vpp = NULL; @@ -1170,7 +1174,7 @@ int error, isdir = 0; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd mode=0x%x\n", VTOI(vp), mode); if (fuse_isdeadfs(vp)) { return ENXIO; @@ -1214,7 +1218,8 @@ int ioflag = ap->a_ioflag; struct ucred *cred = ap->a_cred; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd offset=%jd resid=%zd\n", + VTOI(vp), uio->uio_offset, uio->uio_resid); if (fuse_isdeadfs(vp)) { return EIO; @@ -1247,7 +1252,7 @@ int err = 0; int freefufh = 0; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { return EBADF; @@ -1304,7 +1309,7 @@ struct fuse_dispatcher fdi; int err; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs(vp)) { return EBADF; @@ -1351,12 +1356,12 @@ int type; - fuse_trace_printf_vnop(); - if (!fvdat) { panic("FUSE: no vnode data during recycling"); } + DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp)); + for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); if (FUFH_IS_VALID(fufh)) { @@ -1397,7 +1402,8 @@ int err; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd name=%*s\n", + VTOI(vp), (int)cnp->cn_namelen, cnp->cn_nameptr); if (fuse_isdeadfs_fs(vp)) { panic("FUSE: fuse_vnop_remove(): called on a dead file system"); @@ -1441,7 +1447,10 @@ int err = 0; - fuse_trace_printf_vnop(); + DEBUG2G("from: inode=%jd name=%*s -> to: inode=%jd name=%*s\n", + VTOI(fvp), (int)fcnp->cn_namelen, fcnp->cn_nameptr, + (tvp == NULL ? (intmax_t)-1 : VTOI(tvp)), + (int)tcnp->cn_namelen, tcnp->cn_nameptr); if (fuse_isdeadfs_fs(fdvp)) { panic("FUSE: fuse_vnop_rename(): called on a dead file system"); @@ -1512,7 +1521,7 @@ int err; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd\n", VTOI(vp)); if (fuse_isdeadfs_fs(vp)) { panic("FUSE: fuse_vnop_rmdir(): called on a dead file system"); @@ -1557,7 +1566,7 @@ int sizechanged = 0; uint64_t newsize = 0; - fuse_trace_printf_vnop(); + DEBUG2G("inode=%jd\n", VTOI(vp)); /* * XXX: Locking @@ -1588,20 +1597,18 @@ bzero(&facp, sizeof(facp)); -#define FUSEATTR(x) x - facp.xuid = vap->va_uid; facp.xgid = vap->va_gid; if (vap->va_uid != (uid_t)VNOVAL) { facp.facc_flags |= FACCESS_CHOWN; - fsai->FUSEATTR(uid) = vap->va_uid; + fsai->uid = vap->va_uid; fsai->valid |= FATTR_UID; } if (vap->va_gid != (gid_t)VNOVAL) { facp.facc_flags |= FACCESS_CHOWN; - fsai->FUSEATTR(gid) = vap->va_gid; + fsai->gid = vap->va_gid; fsai->valid |= FATTR_GID; } @@ -1610,7 +1617,7 @@ struct fuse_filehandle *fufh = NULL; // Truncate to a new value. - fsai->FUSEATTR(size) = vap->va_size; + fsai->size = vap->va_size; sizechanged = 1; newsize = vap->va_size; fsai->valid |= FATTR_SIZE; @@ -1623,24 +1630,22 @@ } if (vap->va_atime.tv_sec != VNOVAL) { - fsai->FUSEATTR(atime) = vap->va_atime.tv_sec; - fsai->FUSEATTR(atimensec) = vap->va_atime.tv_nsec; + fsai->atime = vap->va_atime.tv_sec; + fsai->atimensec = vap->va_atime.tv_nsec; fsai->valid |= FATTR_ATIME; } if (vap->va_mtime.tv_sec != VNOVAL) { - fsai->FUSEATTR(mtime) = vap->va_mtime.tv_sec; - fsai->FUSEATTR(mtimensec) = vap->va_mtime.tv_nsec; + fsai->mtime = vap->va_mtime.tv_sec; + fsai->mtimensec = vap->va_mtime.tv_nsec; fsai->valid |= FATTR_MTIME; } if (vap->va_mode != (mode_t)VNOVAL) { - fsai->FUSEATTR(mode) = vap->va_mode & ALLPERMS; + fsai->mode = vap->va_mode & ALLPERMS; fsai->valid |= FATTR_MODE; } -#undef FUSEATTR - if (!fsai->valid) { goto out; } @@ -1768,6 +1773,9 @@ int err; size_t len; + DEBUG2G("inode=%jd name=%*s\n", + VTOI(dvp), (int)cnp->cn_namelen, cnp->cn_nameptr); + if (fuse_isdeadfs_fs(dvp)) { panic("FUSE: fuse_vnop_symlink(): called on a dead file system"); } @@ -1868,6 +1876,11 @@ pages = ap->a_m; count = ap->a_count; + if (!fuse_vnode_mmap_enable(vp)) { + DEBUG("called on non-cacheable vnode??\n"); + return (VM_PAGER_ERROR); + } + npages = btoc(count); /* @@ -2058,6 +2071,10 @@ npages = btoc(count); offset = IDX_TO_OFF(pages[0]->pindex); + if (!fuse_vnode_mmap_enable(vp)) { + DEBUG("called on non-cacheable vnode??\n"); + } + for (i = 0; i < npages; i++) rtvals[i] = VM_PAGER_AGAIN; From owner-p4-projects@FreeBSD.ORG Sat Jul 9 08:57:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 038BD1065670; Sat, 9 Jul 2011 08:57:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8ED2106566B for ; Sat, 9 Jul 2011 08:57:19 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A615F8FC08 for ; Sat, 9 Jul 2011 08:57:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p698vJpO043194 for ; Sat, 9 Jul 2011 08:57:19 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p698vJcw043191 for perforce@freebsd.org; Sat, 9 Jul 2011 08:57:19 GMT (envelope-from ilya@FreeBSD.org) Date: Sat, 9 Jul 2011 08:57:19 GMT Message-Id: <201107090857.p698vJcw043191@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2011 08:57:20 -0000 http://p4web.freebsd.org/@@195924?ac=10 Change 195924 by ilya@ilya_triton2011 on 2011/07/09 08:57:08 IO cleanup. Remove fuse_io_vnode, fuse_io_p2p, PAGEOP_TRANSLATE_UIO Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#15 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#8 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#36 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#15 (text+ko) ==== @@ -45,22 +45,14 @@ #include "fuse_debug.h" static int fuse_read_directbackend(struct fuse_io_data *fioda); -static int fuse_io_p2p(struct fuse_io_data *fioda, struct fuse_dispatcher *fdip); static int fuse_read_biobackend(struct fuse_io_data *fioda); static int fuse_write_directbackend(struct fuse_io_data *fioda); static int fuse_write_biobackend(struct fuse_io_data *fioda); static fuse_buffeater_t fuse_std_buffeater; -/**************** - * - * >>> Low level I/O routines and interface to them - * - ****************/ - -/* main I/O dispatch routine */ int -fuse_io_dispatch(struct vnode *vp, struct uio *uio, int flag, +fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) { struct fuse_filehandle *fufh; @@ -91,7 +83,7 @@ * we hardwire it into the file's private data (similarly to Linux, * btw.). */ - directio = (flag & O_DIRECT) || !fuse_vnode_cache_enable(vp); + directio = (ioflag & IO_DIRECT) || !fuse_vnode_cache_enable(vp); switch (uio->uio_rw) { case UIO_READ: @@ -99,21 +91,21 @@ fioda.buffeater = fuse_std_buffeater; if (directio) { - DEBUG2G("direct read of vnode %ju via file handle %ju\n", + DEBUG("direct read of vnode %ju via file handle %ju\n", (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); err = fuse_read_directbackend(&fioda); } else { - DEBUG2G("buffered read of vnode %ju\n", (uintmax_t)VTOILLU(vp)); + DEBUG("buffered read of vnode %ju\n", (uintmax_t)VTOILLU(vp)); err = fuse_read_biobackend(&fioda); } break; case UIO_WRITE: if (directio) { - DEBUG2G("direct write of vnode %ju via file handle %ju\n", + DEBUG("direct write of vnode %ju via file handle %ju\n", (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); err = fuse_write_directbackend(&fioda); } else { - DEBUG2G("buffered write of vnode %ju\n", (uintmax_t)VTOILLU(vp)); + DEBUG("buffered write of vnode %ju\n", (uintmax_t)VTOILLU(vp)); err = fuse_write_biobackend(&fioda); } break; @@ -126,32 +118,7 @@ return (err); } -/* dispatch routine for vnode based I/O */ -int -fuse_io_vnode(struct vnode *vp, struct uio *uio, - int ioflag, struct ucred *cred) -{ - int fflag = (uio->uio_rw == UIO_READ) ? FREAD : FWRITE; - int err; - - if (ioflag & IO_DIRECT) - fflag |= O_DIRECT; - if (ioflag & IO_NDELAY) - fflag |= FNONBLOCK; - if (ioflag & IO_APPEND) - fflag |= O_APPEND; - if (ioflag & IO_ASYNC) - fflag |= O_ASYNC; - if (ioflag & IO_SYNC) - fflag |= O_SYNC; - - err = fuse_io_dispatch(vp, uio, fflag, cred); - - DEBUG("return with %d\n", err); - return (err); -} - -int +static int fuse_read_biobackend(struct fuse_io_data *fioda) { @@ -279,13 +246,6 @@ * processing (we are not called from readdir) we can already invoke * an optimized, "peer-to-peer" I/O routine. */ - if (buffe == fuse_std_buffeater && uio->uio_segflg == UIO_SYSSPACE) { - if ((err = fuse_io_p2p(fioda, &fdi))) - goto out; - else - goto done; - } - while (uio->uio_resid > 0) { fdi.iosize = sizeof(*fri); fdisp_make_vp(&fdi, op, vp, td, cred); @@ -307,97 +267,12 @@ break; } -done: fuse_ticket_drop(fdi.tick); out: return ((err == -1) ? 0 : err); } -/* direct I/O routine with no intermediate buffer */ -static int -fuse_io_p2p(struct fuse_io_data *fioda, struct fuse_dispatcher *fdip) -{ - struct vnode *vp = fioda->vp; - struct fuse_filehandle *fufh = fioda->fufh; - struct uio *uio = fioda->uio; - struct ucred *cred = fioda->cred; - struct thread *td = fioda->td; - enum fuse_opcode op; - - int err = 0; - int chunksize = 0; - struct iovec *iov; - int nmax = (uio->uio_rw == UIO_READ) ? - fuse_get_mpdata(vp->v_mount)->max_read : - fuse_get_mpdata(vp->v_mount)->max_write; - - op = fioda->opcode ?: - ((uio->uio_rw == UIO_READ) ? FUSE_READ : FUSE_WRITE); - - iov = uio->uio_iov; - while (uio->uio_resid > 0) { - int transfersize; - - chunksize = MIN(iov->iov_len, nmax); - - if (uio->uio_rw == UIO_READ) { - struct fuse_read_in *fri; - - fdip->iosize = sizeof(struct fuse_read_in); - fdisp_make_vp(fdip, op, vp, td, cred); - fri = fdip->indata; - fri->fh = fufh->fh_id; - fri->offset = uio->uio_offset; - fri->size = chunksize; - fdip->tick->tk_aw_type = FT_A_BUF; - fdip->tick->tk_aw_bufdata = iov->iov_base; - } else { - struct fuse_write_in *fwi; - - fdip->iosize = sizeof(struct fuse_write_in) + chunksize; - fdisp_make_vp(fdip, op, vp, td, cred); - fwi = fdip->indata; - fwi->fh = fufh->fh_id; - fwi->offset = uio->uio_offset; - fwi->size = chunksize; - fdip->tick->tk_ms_type = FT_M_BUF; - fdip->tick->tk_ms_bufdata = iov->iov_base; - fdip->tick->tk_ms_bufsize = chunksize; - } - - DEBUG2G("chunksize %d\n", chunksize); - fdip->finh->len = (sizeof *fdip->finh) + chunksize; - err = fdisp_wait_answ(fdip); - - if (err) - return (err); - - transfersize = (uio->uio_rw == UIO_READ) ? - fdip->tick->tk_aw_ohead.len - sizeof(struct fuse_out_header) : - ((struct fuse_write_out *)fdip->answ)->size; - - uio->uio_resid -= transfersize; - uio->uio_offset += transfersize; - iov->iov_len -= transfersize; - iov->iov_base = (char *)iov->iov_base + transfersize; - - if (iov->iov_len == 0) { - iov++; - uio->uio_iovcnt--; - } - DEBUG2G("resid %zd, offset %ju, iovcnt %d, iov_len %zd, " - "transfersize %d\n", - uio->uio_resid, (uintmax_t)uio->uio_offset, - uio->uio_iovcnt, iov->iov_len, transfersize); - - if (transfersize < chunksize) - break; - } - - return (0); -} - /* Simple standard way for transmitting input */ static int fuse_std_buffeater(struct uio *uio, size_t reqsize, void *buf, size_t bufsize, void *param) @@ -434,13 +309,6 @@ fdisp_init(&fdi, 0); - if (uio->uio_segflg == UIO_SYSSPACE) { - if ((err = fuse_io_p2p(fioda, &fdi))) - return (err); - else - goto out; - } - while (uio->uio_resid > 0) { chunksize = MIN(uio->uio_resid, fuse_get_mpdata(vp->v_mount)->max_write); @@ -470,21 +338,18 @@ uio->uio_offset -= diff; } -out: fuse_ticket_drop(fdi.tick); return (err); } -/* - * Vnode op for write using bio - */ static int fuse_write_biobackend(struct fuse_io_data *fioda) { struct vnode *vp = fioda->vp; struct uio *uio = fioda->uio; struct ucred *cred = fioda->cred; + struct fuse_vnode_data *fvdat = VTOFUD(vp); int biosize; @@ -492,9 +357,8 @@ daddr_t lbn; int bcount; int n, on, err = 0; - off_t fsize = VTOFUD(vp)->filesize; - DEBUG2G("fsize %lld\n", (long long int)fsize); + DEBUG2G("fsize %ju\n", (uintmax_t)fvdat->filesize); biosize = vp->v_mount->mnt_stat.f_iosize; @@ -520,7 +384,7 @@ * unaligned buffer size. */ - if (uio->uio_offset == fsize && n) { + if (uio->uio_offset == fvdat->filesize && n) { /* * Get the buffer (in its pre-append state to maintain * B_CACHE if it was previously set). Resize the @@ -534,8 +398,7 @@ if (bp != NULL) { long save; - fsize = uio->uio_offset + n; - fuse_vnode_setsize(vp, fsize); + fuse_vnode_setsize(vp, uio->uio_offset + n); save = bp->b_flags & B_CACHE; bcount += n; @@ -548,17 +411,16 @@ * adjust the file's size as appropriate. */ bcount = on + n; - if ((off_t)lbn * biosize + bcount < fsize) { - if ((off_t)(lbn + 1) * biosize < fsize) + if ((off_t)lbn * biosize + bcount < fvdat->filesize) { + if ((off_t)(lbn + 1) * biosize < fvdat->filesize) bcount = biosize; else - bcount = fsize - (off_t)lbn * biosize; + bcount = fvdat->filesize - (off_t)lbn * biosize; } DEBUG("getting block from OS, bcount %d\n", bcount); bp = getblk(vp, lbn, bcount, PCATCH, 0, 0); - if (uio->uio_offset + n > fsize) { - fsize = uio->uio_offset + n; - fuse_vnode_setsize(vp, fsize); + if (uio->uio_offset + n > fvdat->filesize) { + fuse_vnode_setsize(vp, uio->uio_offset + n); } } @@ -596,7 +458,7 @@ bp->b_iocmd = BIO_READ; vfs_busy_pages(bp, 0); fuse_io_strategy(vp, bp, NULL, 0); - if ((err = bp->b_error)) { + if ((err = bp->b_error)) { brelse(bp); break; } @@ -614,7 +476,7 @@ */ if (bp->b_dirtyend > bcount) { - DEBUG2G("Fuse append race @%lx:%d\n", + DEBUG("Fuse append race @%lx:%d\n", (long)bp->b_blkno * biosize, bp->b_dirtyend - bcount); bp->b_dirtyend = bcount; @@ -696,7 +558,6 @@ return (err); } -/* core strategy like routine */ int fuse_io_strategy(struct vnode *vp, struct buf *bp, struct fuse_filehandle *fufh, enum fuse_opcode op) ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#8 (text+ko) ==== @@ -18,9 +18,7 @@ void *param; }; -int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int flag, - struct ucred *cred); -int fuse_io_vnode(struct vnode *vp, struct uio *uio, int ioflag, +int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred); int fuse_io_strategy(struct vnode *vp, struct buf *bp, struct fuse_filehandle *fufh, enum fuse_opcode op); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#36 (text+ko) ==== @@ -1225,7 +1225,7 @@ return EIO; } - return fuse_io_vnode(vp, uio, ioflag, cred); + return fuse_io_dispatch(vp, uio, ioflag, cred); } /* @@ -1827,23 +1827,10 @@ return EIO; } - return fuse_io_vnode(vp, uio, ioflag, cred); + return fuse_io_dispatch(vp, uio, ioflag, cred); } /* - * [gs]etpages taken & stripped off from nfsclient - */ - -#ifndef PAGEOP_TRANSLATE_UIO -#define PAGEOP_TRANSLATE_UIO 1 -#endif -#if PAGEOP_TRANSLATE_UIO -#define FUSE_PAGEOPS_RESID uio.uio_resid -#else -#define FUSE_PAGEOPS_RESID bp->b_resid -#endif - -/* struct vnop_getpages_args { struct vnode *a_vp; vm_page_t *a_m; @@ -1856,10 +1843,8 @@ fuse_vnop_getpages(struct vop_getpages_args *ap) { int i, error, nextoff, size, toff, count, npages; -#if PAGEOP_TRANSLATE_UIO struct uio uio; struct iovec iov; -#endif vm_offset_t kva; struct buf *bp; struct vnode *vp; @@ -1889,28 +1874,22 @@ * can only occur at the file EOF. */ - { - vm_page_t m = pages[ap->a_reqpage]; - - VM_OBJECT_LOCK(vp->v_object); - fuse_vm_page_lock_queues(); - if (m->valid != 0) { - /* handled by vm_fault now */ - /* vm_page_zero_invalid(m, TRUE); */ - for (i = 0; i < npages; ++i) { - if (i != ap->a_reqpage) { - fuse_vm_page_lock(pages[i]); - vm_page_free(pages[i]); - fuse_vm_page_unlock(pages[i]); - } + VM_OBJECT_LOCK(vp->v_object); + fuse_vm_page_lock_queues(); + if (pages[ap->a_reqpage]->valid != 0) { + for (i = 0; i < npages; ++i) { + if (i != ap->a_reqpage) { + fuse_vm_page_lock(pages[i]); + vm_page_free(pages[i]); + fuse_vm_page_unlock(pages[i]); } - fuse_vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(vp->v_object); - return(0); } fuse_vm_page_unlock_queues(); VM_OBJECT_UNLOCK(vp->v_object); + return 0; } + fuse_vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(vp->v_object); /* * We use only the kva address for the buffer, but this is extremely @@ -1920,10 +1899,9 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + PCPU_INC(cnt.v_vnodein); + PCPU_ADD(cnt.v_vnodepgsin, npages); -#if PAGEOP_TRANSLATE_UIO iov.iov_base = (caddr_t) kva; iov.iov_len = count; uio.uio_iov = &iov; @@ -1934,16 +1912,13 @@ uio.uio_rw = UIO_READ; uio.uio_td = td; - error = fuse_io_dispatch(vp, &uio, FREAD | O_DIRECT, cred); -#else - error = fuse_io_strategy(vp, bp); -#endif + error = fuse_io_dispatch(vp, &uio, IO_DIRECT, cred); pmap_qremove(kva, npages); relpbuf(bp, &fuse_pbuf_freecnt); - if (error && (FUSE_PAGEOPS_RESID == count)) { - DEBUG2G("error %d\n", error); + if (error && (uio.uio_resid == count)) { + DEBUG("error %d\n", error); VM_OBJECT_LOCK(vp->v_object); fuse_vm_page_lock_queues(); for (i = 0; i < npages; ++i) { @@ -1964,7 +1939,7 @@ * does not mean that the remaining data is invalid! */ - size = count - FUSE_PAGEOPS_RESID; + size = count - uio.uio_resid; VM_OBJECT_LOCK(vp->v_object); fuse_vm_page_lock_queues(); for (i = 0, toff = 0; i < npages; i++, toff = nextoff) { @@ -1977,15 +1952,16 @@ * Read operation filled an entire page */ m->valid = VM_PAGE_BITS_ALL; - vm_page_undirty(m); + KASSERT(m->dirty == 0, + ("fuse_getpages: page %p is dirty", m)); } else if (size > toff) { /* * Read operation filled a partial page. */ m->valid = 0; - vm_page_set_validclean(m, 0, size - toff); - /* handled by vm_fault now */ - /* vm_page_zero_invalid(m, TRUE); */ + vm_page_set_valid(m, 0, size - toff); + KASSERT(m->dirty == 0, + ("fuse_getpages: page %p is dirty", m)); } else { /* * Read operation was short. If no error occured @@ -2043,10 +2019,8 @@ static int fuse_vnop_putpages(struct vop_putpages_args *ap) { -#if PAGEOP_TRANSLATE_UIO struct uio uio; struct iovec iov; -#endif vm_offset_t kva; struct buf *bp; int i, error, npages, count; @@ -2096,10 +2070,9 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodeout++; - cnt.v_vnodepgsout += count; + PCPU_INC(cnt.v_vnodeout); + PCPU_ADD(cnt.v_vnodepgsout, count); -#if PAGEOP_TRANSLATE_UIO iov.iov_base = (caddr_t) kva; iov.iov_len = count; uio.uio_iov = &iov; @@ -2110,16 +2083,13 @@ uio.uio_rw = UIO_WRITE; uio.uio_td = td; - error = fuse_io_dispatch(vp, &uio, FWRITE | O_DIRECT, cred); -#else - error = fuse_io_strategy(vp, bp); -#endif + error = fuse_io_dispatch(vp, &uio, IO_DIRECT, cred); pmap_qremove(kva, npages); relpbuf(bp, &fuse_pbuf_freecnt); if (!error) { - int nwritten = round_page(count - FUSE_PAGEOPS_RESID) / PAGE_SIZE; + int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE; for (i = 0; i < nwritten; i++) { rtvals[i] = VM_PAGER_OK; vm_page_undirty(pages[i]); @@ -2127,7 +2097,6 @@ } return rtvals[0]; } -#undef FUSE_PAGEOPS_RESID /* struct vnop_print_args { From owner-p4-projects@FreeBSD.ORG Sat Jul 9 08:59:31 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F1521065670; Sat, 9 Jul 2011 08:59:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11430106564A for ; Sat, 9 Jul 2011 08:59:31 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F23458FC14 for ; Sat, 9 Jul 2011 08:59:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p698xUek043257 for ; Sat, 9 Jul 2011 08:59:30 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p698xUsI043254 for perforce@freebsd.org; Sat, 9 Jul 2011 08:59:30 GMT (envelope-from ilya@FreeBSD.org) Date: Sat, 9 Jul 2011 08:59:30 GMT Message-Id: <201107090859.p698xUsI043254@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2011 08:59:31 -0000 http://p4web.freebsd.org/@@195925?ac=10 Change 195925 by ilya@ilya_triton2011 on 2011/07/09 08:59:09 Rewrite fuse_io_strategy to be similar to NFS. Set iosize to PAGE_SIZE (was MAXBSIZE) Set file size in fuse_write_directbackend Refresh file size before write Remove fuse_std_buffeater Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#16 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#9 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#15 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#15 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#20 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#37 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#17 (text+ko) ==== @@ -130,6 +130,13 @@ return fuse_isdeadfs_mp(vnode_mount(vp)); } +static __inline__ +int +fuse_iosize(struct vnode *vp) +{ + return vp->v_mount->mnt_stat.f_iosize; +} + /* access */ #define FVP_ACCESS_NOOP 0x01 ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#16 (text+ko) ==== @@ -38,27 +38,32 @@ #include "fuse.h" #include "fuse_file.h" #include "fuse_node.h" +#include "fuse_internal.h" #include "fuse_ipc.h" #include "fuse_io.h" #define FUSE_DEBUG_MODULE IO #include "fuse_debug.h" -static int fuse_read_directbackend(struct fuse_io_data *fioda); -static int fuse_read_biobackend(struct fuse_io_data *fioda); -static int fuse_write_directbackend(struct fuse_io_data *fioda); -static int fuse_write_biobackend(struct fuse_io_data *fioda); -static fuse_buffeater_t fuse_std_buffeater; +static int fuse_read_directbackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh); +static int fuse_read_biobackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh); +static int fuse_write_directbackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh); +static int fuse_write_biobackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh); int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) { struct fuse_filehandle *fufh; - struct fuse_io_data fioda; int err, directio; + MPASS(vp->v_type == VREG); + err = fuse_filehandle_getrw(vp, (uio->uio_rw == UIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh); if (err) { @@ -66,13 +71,6 @@ return err; } - bzero(&fioda, sizeof(fioda)); - fioda.vp = vp; - fioda.fufh = fufh; - fioda.uio = uio; - fioda.cred = cred; - fioda.td = curthread; - /* * Ideally, when the daemon asks for direct io at open time, the * standard file flag should be set according to this, so that would @@ -87,26 +85,23 @@ switch (uio->uio_rw) { case UIO_READ: - fioda.opcode = FUSE_READ; - fioda.buffeater = fuse_std_buffeater; - if (directio) { DEBUG("direct read of vnode %ju via file handle %ju\n", (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); - err = fuse_read_directbackend(&fioda); + err = fuse_read_directbackend(vp, uio, cred, fufh); } else { DEBUG("buffered read of vnode %ju\n", (uintmax_t)VTOILLU(vp)); - err = fuse_read_biobackend(&fioda); + err = fuse_read_biobackend(vp, uio, cred, fufh); } break; case UIO_WRITE: if (directio) { DEBUG("direct write of vnode %ju via file handle %ju\n", (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); - err = fuse_write_directbackend(&fioda); + err = fuse_write_directbackend(vp, uio, cred, fufh); } else { DEBUG("buffered write of vnode %ju\n", (uintmax_t)VTOILLU(vp)); - err = fuse_write_biobackend(&fioda); + err = fuse_write_biobackend(vp, uio, cred, fufh); } break; default: @@ -119,30 +114,28 @@ } static int -fuse_read_biobackend(struct fuse_io_data *fioda) +fuse_read_biobackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh) { - - struct vnode *vp = fioda->vp; - struct fuse_filehandle *fufh = fioda->fufh; - struct uio *uio = fioda->uio; - enum fuse_opcode op = fioda->opcode; - fuse_buffeater_t *buffe = fioda->buffeater; - void *param = fioda->param; - - int biosize; struct buf *bp; daddr_t lbn; int bcount; - int bbcount; int err = 0, n = 0, on = 0; + off_t filesize; + + const int biosize = fuse_iosize(vp); + + DEBUG("resid=%zx offset=%jx fsize=%jx\n", + uio->uio_resid, uio->uio_offset, VTOFUD(vp)->filesize); if (uio->uio_resid == 0) return (0); + if (uio->uio_offset < 0) + return (EINVAL); - biosize = vp->v_mount->mnt_stat.f_iosize; bcount = MIN(MAXBSIZE, biosize); + filesize = VTOFUD(vp)->filesize; - DEBUG2G("entering loop\n"); do { lbn = uio->uio_offset / biosize; on = uio->uio_offset & (biosize - 1); @@ -160,6 +153,11 @@ * * Note that bcount is *not* DEV_BSIZE aligned. */ + if ((off_t)lbn * biosize >= filesize) { + bcount = 0; + } else if ((off_t)(lbn + 1) * biosize > filesize) { + bcount = filesize - (off_t)lbn * biosize; + } bp = getblk(vp, lbn, bcount, PCATCH, 0, 0); @@ -174,7 +172,7 @@ if ((bp->b_flags & B_CACHE) == 0) { bp->b_iocmd = BIO_READ; vfs_busy_pages(bp, 0); - err = fuse_io_strategy(vp, bp, fufh, op); + err = fuse_io_strategy(vp, bp); if (err) { brelse(bp); return (err); @@ -190,43 +188,25 @@ */ n = 0; - /* - * If we zero pad the buf, bp->b_resid will be 0, so then - * just ignore it - */ - bbcount = bcount - bp->b_resid; - if (on < bbcount) - n = bbcount - on; + if (on < bcount) + n = MIN((unsigned)(bcount - on), uio->uio_resid); if (n > 0) { DEBUG2G("feeding buffeater with %d bytes of buffer %p, saying %d was asked for\n", n, bp->b_data + on, n + (int)bp->b_resid); -#if 0 && _DEBUG - prettyprint(bp->b_data + on, n); - printf("\n"); -#endif - err = buffe(uio, n + bp->b_resid, bp->b_data + on, n, - param); + err = uiomove(bp->b_data + on, n, uio); } brelse(bp); DEBUG2G("end of turn, err %d, uio->uio_resid %zd, n %d\n", err, uio->uio_resid, n); } while (err == 0 && uio->uio_resid > 0 && n > 0); - return ((err == -1) ? 0 : err); + return (err); } static int -fuse_read_directbackend(struct fuse_io_data *fioda) +fuse_read_directbackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh) { - struct vnode *vp = fioda->vp; - struct fuse_filehandle *fufh = fioda->fufh; - struct uio *uio = fioda->uio; - struct ucred *cred = fioda->cred; - struct thread *td = fioda->td; - enum fuse_opcode op = fioda->opcode; - fuse_buffeater_t *buffe = fioda->buffeater; - void *param = fioda->param; - struct fuse_dispatcher fdi; struct fuse_read_in *fri; int err = 0; @@ -234,8 +214,6 @@ if (uio->uio_resid == 0) return (0); - DEBUG("bug daemon for food\n"); - fdisp_init(&fdi, 0); /* @@ -248,7 +226,7 @@ */ while (uio->uio_resid > 0) { fdi.iosize = sizeof(*fri); - fdisp_make_vp(&fdi, op, vp, td, cred); + fdisp_make_vp(&fdi, FUSE_READ, vp, uio->uio_td, cred); fri = fdi.indata; fri->fh = fufh->fh_id; fri->offset = uio->uio_offset; @@ -260,48 +238,31 @@ if ((err = fdisp_wait_answ(&fdi))) goto out; - DEBUG2G("%zd bytes asked for from offset %ju, passing on the %jd we got\n", - uio->uio_resid, (uintmax_t)uio->uio_offset, (uintmax_t)fdi.iosize); + DEBUG2G("complete: got iosize=%d, requested fri.size=%zd; " + "resid=%zd offset=%ju\n", + fri->size, fdi.iosize, uio->uio_resid, (uintmax_t)uio->uio_offset); - if ((err = buffe(uio, fri->size, fdi.answ, fdi.iosize, param))) + if ((err = uiomove(fdi.answ, MIN(fri->size, fdi.iosize), uio))) break; + if (fdi.iosize < fri->size) + break; } fuse_ticket_drop(fdi.tick); out: - return ((err == -1) ? 0 : err); + return (err); } -/* Simple standard way for transmitting input */ static int -fuse_std_buffeater(struct uio *uio, size_t reqsize, void *buf, size_t bufsize, void *param) -{ - int err; - - if ((err = uiomove(buf, MIN(reqsize, bufsize), uio))) - return (err); - - if (bufsize < reqsize) - return (-1); - - return (0); -} - - -static int -fuse_write_directbackend(struct fuse_io_data *fioda) +fuse_write_directbackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh) { - struct vnode *vp = fioda->vp; - uint64_t fh_id = fioda->fufh->fh_id; - struct uio *uio = fioda->uio; - struct ucred *cred = fioda->cred; - struct thread *td = fioda->td; - + struct fuse_vnode_data *fvdat = VTOFUD(vp); + struct fuse_write_in *fwi; + struct fuse_dispatcher fdi; size_t chunksize; int diff; - struct fuse_write_in *fwi; - struct fuse_dispatcher fdi; int err = 0; if (! uio->uio_resid) @@ -314,10 +275,10 @@ fuse_get_mpdata(vp->v_mount)->max_write); fdi.iosize = sizeof(*fwi) + chunksize; - fdisp_make_vp(&fdi, FUSE_WRITE, vp, td, cred); + fdisp_make_vp(&fdi, FUSE_WRITE, vp, uio->uio_td, cred); fwi = fdi.indata; - fwi->fh = fh_id; + fwi->fh = fufh->fh_id; fwi->offset = uio->uio_offset; fwi->size = chunksize; @@ -336,6 +297,8 @@ uio->uio_resid += diff; uio->uio_offset -= diff; + if (uio->uio_offset > fvdat->filesize) + fuse_vnode_setsize(vp, uio->uio_offset); } fuse_ticket_drop(fdi.tick); @@ -344,23 +307,26 @@ } static int -fuse_write_biobackend(struct fuse_io_data *fioda) +fuse_write_biobackend(struct vnode *vp, struct uio *uio, + struct ucred *cred, struct fuse_filehandle *fufh) { - struct vnode *vp = fioda->vp; - struct uio *uio = fioda->uio; - struct ucred *cred = fioda->cred; struct fuse_vnode_data *fvdat = VTOFUD(vp); - - int biosize; - struct buf *bp; daddr_t lbn; int bcount; int n, on, err = 0; - DEBUG2G("fsize %ju\n", (uintmax_t)fvdat->filesize); + const int biosize = fuse_iosize(vp); - biosize = vp->v_mount->mnt_stat.f_iosize; + KASSERT(uio->uio_rw == UIO_WRITE, ("ncl_write mode")); + DEBUG("resid=%zx offset=%jx fsize=%jx\n", + uio->uio_resid, uio->uio_offset, fvdat->filesize); + if (vp->v_type != VREG) + return (EIO); + if (uio->uio_offset < 0) + return (EINVAL); + if (uio->uio_resid == 0) + return (0); /* * Find all of this file's B_NEEDCOMMIT buffers. If our writes @@ -383,7 +349,6 @@ * Handle direct append and file extension cases, calculate * unaligned buffer size. */ - if (uio->uio_offset == fvdat->filesize && n) { /* * Get the buffer (in its pre-append state to maintain @@ -457,7 +422,7 @@ if ((bp->b_flags & B_CACHE) == 0) { bp->b_iocmd = BIO_READ; vfs_busy_pages(bp, 0); - fuse_io_strategy(vp, bp, NULL, 0); + fuse_io_strategy(vp, bp); if ((err = bp->b_error)) { brelse(bp); break; @@ -476,7 +441,7 @@ */ if (bp->b_dirtyend > bcount) { - DEBUG("Fuse append race @%lx:%d\n", + DEBUG("FUSE append race @%lx:%d\n", (long)bp->b_blkno * biosize, bp->b_dirtyend - bcount); bp->b_dirtyend = bcount; @@ -550,8 +515,8 @@ vfs_bio_set_valid(bp, on, n); } - bwrite(bp); - if ((err = bp->b_error)) + err = bwrite(bp); + if (err) break; } while (uio->uio_resid > 0 && n > 0); @@ -559,31 +524,42 @@ } int -fuse_io_strategy(struct vnode *vp, struct buf *bp, struct fuse_filehandle *fufh, - enum fuse_opcode op) +fuse_io_strategy(struct vnode *vp, struct buf *bp) { + struct fuse_filehandle *fufh; struct fuse_vnode_data *fvdat = VTOFUD(vp); - struct fuse_dispatcher fdi; - struct ucred *cred; - int err = 0; - int chunksize, respsize; - caddr_t bufdat; - int biosize = vp->v_mount->mnt_stat.f_iosize; + struct ucred *cred; + struct uio *uiop; + struct uio uio; + struct iovec io; + int error = 0; + + const int biosize = fuse_iosize(vp); + + MPASS(vp->v_type == VREG); + MPASS(bp->b_iocmd == BIO_READ || bp->b_iocmd == BIO_WRITE); + DEBUG("inode=%jd offset=%jd resid=%jd\n", + VTOI(vp), ((off_t)bp->b_blkno) * biosize, bp->b_bcount); - if (! (vp->v_type == VREG || vp->v_type == VDIR)) { - DEBUG("for vnode #%ju v_type is %d, dropping\n", - (uintmax_t)VTOILLU(vp), vp->v_type); - return (EOPNOTSUPP); + error = fuse_filehandle_getrw(vp, + (bp->b_iocmd == BIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh); + if (error) { + DEBUG("fetching filehandle failed\n"); + bp->b_ioflags |= BIO_ERROR; + bp->b_error = error; + return (error); } - if (bp->b_iocmd != BIO_READ && bp->b_iocmd != BIO_WRITE) { - DEBUG("for vnode #%ju bio tried with biocmd %#x, dropping\n", - (uintmax_t)VTOILLU(vp), bp->b_iocmd); - return (EOPNOTSUPP); - } + cred = bp->b_iocmd == BIO_READ ? bp->b_rcred : bp->b_wcred; + + uiop = &uio; + uiop->uio_iov = &io; + uiop->uio_iovcnt = 1; + uiop->uio_segflg = UIO_SYSSPACE; + uiop->uio_td = curthread; /* - * clear BIO_ERROR and B_INVAL state prior to initiating the I/O. We + * clear BIO_ERROR and B_INVAL state prior to initiating the I/O. We * do this here so we do not have to do it in all the code that * calls us. */ @@ -591,157 +567,85 @@ bp->b_ioflags &= ~BIO_ERROR; KASSERT(!(bp->b_flags & B_DONE), - ("fuse_strategy: bp %p already marked done", bp)); - - if (bp->b_bcount == 0) - return (0); - - cred = bp->b_iocmd == BIO_READ ? bp->b_rcred : bp->b_wcred; - - err = fuse_filehandle_getrw(vp, - (bp->b_iocmd == BIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh); - if (err) { - DEBUG("fetching filehandle failed\n"); - goto out; - } - - DEBUG2G("vp #%ju, fufh #%ju\n", - (uintmax_t)VTOILLU(vp), (uintmax_t)fufh->fh_id); - - fdisp_init(&fdi, 0); - + ("fuse_io_strategy: bp %p already marked done", bp)); if (bp->b_iocmd == BIO_READ) { - struct fuse_read_in *fri; - int ioff = 0; + io.iov_len = uiop->uio_resid = bp->b_bcount; + io.iov_base = bp->b_data; + uiop->uio_rw = UIO_READ; - bufdat = bp->b_data; - bp->b_resid = bp->b_bcount; - while (bp->b_resid > 0) { - DEBUG2G("starting bio with resid %ld\n", bp->b_resid); - chunksize = MIN(bp->b_resid, - fuse_get_mpdata(vp->v_mount)->max_read); - fdi.iosize = sizeof(*fri); - if (! op) - op = vp->v_type == VDIR ? FUSE_READDIR : FUSE_READ; - fdisp_make_vp(&fdi, op, vp, curthread, cred); + uiop->uio_offset = ((off_t)bp->b_blkno) * biosize; + error = fuse_read_directbackend(vp, uiop, cred, fufh); - fri = fdi.indata; - fri->fh = fufh->fh_id; - fri->offset = ((off_t)bp->b_blkno) * biosize + ioff; - chunksize = MIN(chunksize, - MIN(fri->offset + bp->b_resid, - fvdat->filesize) - fri->offset); - if (chunksize == 0) { - respsize = -1; - goto eval; - } - fri->size = chunksize; - fdi.tick->tk_aw_type = FT_A_BUF; - fdi.tick->tk_aw_bufdata = bufdat; + if (!error && uiop->uio_resid) { + /* + * If we had a short read with no error, we must have + * hit a file hole. We should zero-fill the remainder. + * This can also occur if the server hits the file EOF. + * + * Holes used to be able to occur due to pending + * writes, but that is not possible any longer. + */ + int nread = bp->b_bcount - uiop->uio_resid; + int left = uiop->uio_resid; - DEBUG("waiting for answer\n"); - if ((err = fdisp_wait_answ(&fdi))) - goto out; - - respsize = fdi.tick->tk_aw_bufsize; - DEBUG2G("chunksize %d, respsize %d, bp->b_resid %ld, bp->b_bcount %ld\n", - chunksize, respsize, bp->b_resid, bp->b_bcount); - bp->b_resid -= respsize; - bufdat += respsize; - ioff += respsize; - -eval: - DEBUG2G("%d bytes asked for from offset %llu, passing on the %d we got\n", - chunksize, (long long unsigned)fri->offset, respsize); - - if (respsize < chunksize) { - /* - * if we don't get enough data, just fill the - * rest with zeros. - */ - DEBUG("zeroing tail of %ld bytes\n", - bp->b_resid); - bzero((char *)bp->b_data + bp->b_bcount - bp->b_resid, - bp->b_resid); - if (chunksize) - bp->b_resid = 0; - break; - } - if (respsize > chunksize) { - fuse_ticket_drop(fdi.tick); - err = EINVAL; - goto out; - } - DEBUG("bp->b_data %p\n", bp->b_data); + if (left > 0) + bzero((char *)bp->b_data + nread, left); + uiop->uio_resid = 0; + } + if (error) { + bp->b_ioflags |= BIO_ERROR; + bp->b_error = error; } } else { - struct fuse_write_in *fwi; - struct fuse_write_out *fwo; - int diff; - int merr = 0; + /* + * If we only need to commit, try to commit + */ + if (bp->b_flags & B_NEEDCOMMIT) { + DEBUG("write: B_NEEDCOMMIT flags set\n"); + } - bufdat = bp->b_data + bp->b_dirtyoff; - while (bp->b_dirtyend > bp->b_dirtyoff) { - chunksize = MIN(bp->b_dirtyend - bp->b_dirtyoff, - fuse_get_mpdata(vp->v_mount)->max_write); + /* + * Setup for actual write + */ + if ((off_t)bp->b_blkno * biosize + bp->b_dirtyend > fvdat->filesize) + bp->b_dirtyend = fvdat->filesize - (off_t)bp->b_blkno * biosize; - fdi.iosize = sizeof(*fwi); - op = op ?: FUSE_WRITE; - fdisp_make_vp(&fdi, op, vp, NULL, cred); + if (bp->b_dirtyend > bp->b_dirtyoff) { + io.iov_len = uiop->uio_resid = bp->b_dirtyend + - bp->b_dirtyoff; + uiop->uio_offset = (off_t)bp->b_blkno * biosize + + bp->b_dirtyoff; + io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; + uiop->uio_rw = UIO_WRITE; - fwi = fdi.indata; - fwi->fh = fufh->fh_id; - fwi->offset = (off_t)bp->b_blkno * biosize + bp->b_dirtyoff; - fwi->size = chunksize; - fdi.tick->tk_ms_type = FT_M_BUF; - fdi.tick->tk_ms_bufdata = bufdat; - fdi.tick->tk_ms_bufsize = chunksize; + error = fuse_write_directbackend(vp, uiop, cred, fufh); - if ((err = fdisp_wait_answ(&fdi))) { - merr = 1; - break; - } + if (error == EINTR || error == ETIMEDOUT + || (!error && (bp->b_flags & B_NEEDCOMMIT))) { - fwo = fdi.answ; - diff = chunksize - fwo->size; - if (diff < 0) { - err = EINVAL; - break; + bp->b_flags &= ~(B_INVAL|B_NOCACHE); + if ((bp->b_flags & B_PAGING) == 0) { + bdirty(bp); + bp->b_flags &= ~B_DONE; + } + if ((error == EINTR || error == ETIMEDOUT) && + (bp->b_flags & B_ASYNC) == 0) + bp->b_flags |= B_EINTR; + } else { + if (error) { + bp->b_ioflags |= BIO_ERROR; + bp->b_flags |= B_INVAL; + bp->b_error = error; + } + bp->b_dirtyoff = bp->b_dirtyend = 0; } - if (diff > 0) { - /* - * Tolerating a short read would mean - * keeping dirty data around and we - * don't do that. - */ - err = EIO; - break; - } - - bp->b_dirtyoff += fwo->size; + } else { + bp->b_resid = 0; + bufdone(bp); + return (0); } - - if (bp->b_dirtyend == bp->b_dirtyoff) - bp->b_dirtyend = bp->b_dirtyoff = 0; - - bp->b_resid = bp->b_dirtyend - bp->b_dirtyoff; - - if (merr) - goto out; } - - if (fdi.tick) - fuse_ticket_drop(fdi.tick); - else - DEBUG("no ticket on leave\n"); - -out: - if (err) { - bp->b_ioflags |= BIO_ERROR; - bp->b_error = err; - } - DEBUG("calling bufdone\n"); + bp->b_resid = uiop->uio_resid; bufdone(bp); - - return (err); -} + return (error); +} ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#9 (text+ko) ==== @@ -1,26 +1,8 @@ #ifndef _FUSE_IO_H_ #define _FUSE_IO_H_ -/* prototype for processing an input data buffer and an uio - for reading related acivities */ -typedef int fuse_buffeater_t(struct uio *uio, size_t reqsize, - void *buf, size_t bufsize, void *param); - -/* data used through an I/O operation */ -struct fuse_io_data { - struct vnode *vp; - struct fuse_filehandle *fufh; - struct uio *uio; - struct ucred *cred; - struct thread *td; - enum fuse_opcode opcode; - fuse_buffeater_t *buffeater; - void *param; -}; - int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred); -int fuse_io_strategy(struct vnode *vp, struct buf *bp, - struct fuse_filehandle *fufh, enum fuse_opcode op); +int fuse_io_strategy(struct vnode *vp, struct buf *bp); #endif /* _FUSE_IO_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#15 (text+ko) ==== @@ -33,6 +33,7 @@ #include "fuse.h" #include "fuse_node.h" #include "fuse_internal.h" +#include "fuse_io.h" #include "fuse_ipc.h" #define FUSE_DEBUG_MODULE VNOPS @@ -228,6 +229,18 @@ } void +fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred) +{ + struct vattr va; + + if (fuse_isvalid_attr(vp)) + return; + + VOP_GETATTR(vp, &va, cred); + DEBUG("refreshed file size: %jd\n", VTOFUD(vp)->filesize); +} + +void fuse_vnode_setsize(struct vnode *vp, off_t newsize) { struct fuse_vnode_data *fvdat = VTOFUD(vp); ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#15 (text+ko) ==== @@ -103,6 +103,8 @@ int32_t fuse_open_flags, struct thread *td); +void fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred); + void fuse_vnode_setsize(struct vnode *vp, off_t newsize); #endif /* _FUSE_NODE_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#20 (text+ko) ==== @@ -241,7 +241,7 @@ } /* We need this here as this slot is used by getnewvnode() */ - mp->mnt_stat.f_iosize = MAXBSIZE; + mp->mnt_stat.f_iosize = PAGE_SIZE; mp->mnt_data = data; ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#37 (text+ko) ==== @@ -1737,7 +1737,10 @@ return EIO; } - (void)fuse_io_strategy(vp, bp, NULL, 0); + if (bp->b_iocmd == BIO_WRITE) + fuse_vnode_refreshsize(vp, NOCRED); + + (void)fuse_io_strategy(vp, bp); /* * This is a dangerous function. If returns error, that might mean a @@ -1827,6 +1830,8 @@ return EIO; } + fuse_vnode_refreshsize(vp, cred); + return fuse_io_dispatch(vp, uio, ioflag, cred); } From owner-p4-projects@FreeBSD.ORG Sat Jul 9 09:02:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB4061065672; Sat, 9 Jul 2011 09:02:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A54BA106566C for ; Sat, 9 Jul 2011 09:02:46 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 928238FC15 for ; Sat, 9 Jul 2011 09:02:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6992kgq044938 for ; Sat, 9 Jul 2011 09:02:46 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6992kqQ044935 for perforce@freebsd.org; Sat, 9 Jul 2011 09:02:46 GMT (envelope-from ilya@FreeBSD.org) Date: Sat, 9 Jul 2011 09:02:46 GMT Message-Id: <201107090902.p6992kqQ044935@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 195926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2011 09:02:47 -0000 http://p4web.freebsd.org/@@195926?ac=10 Change 195926 by ilya@ilya_triton2011 on 2011/07/09 09:02:07 Truncate vnode buffers in fuse_vnode_setsize Set new size before extending file Flush vnode buffers before close Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#17 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#10 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#16 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#16 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#38 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#17 (text+ko) ==== @@ -298,7 +298,7 @@ uio->uio_resid += diff; uio->uio_offset -= diff; if (uio->uio_offset > fvdat->filesize) - fuse_vnode_setsize(vp, uio->uio_offset); + fuse_vnode_setsize(vp, cred, uio->uio_offset); } fuse_ticket_drop(fdi.tick); @@ -363,7 +363,7 @@ if (bp != NULL) { long save; - fuse_vnode_setsize(vp, uio->uio_offset + n); + fuse_vnode_extend(vp, cred, uio->uio_offset + n); save = bp->b_flags & B_CACHE; bcount += n; @@ -385,7 +385,7 @@ DEBUG("getting block from OS, bcount %d\n", bcount); bp = getblk(vp, lbn, bcount, PCATCH, 0, 0); if (uio->uio_offset + n > fvdat->filesize) { - fuse_vnode_setsize(vp, uio->uio_offset + n); + fuse_vnode_extend(vp, cred, uio->uio_offset + n); } } @@ -649,3 +649,63 @@ bufdone(bp); return (error); } + +/* + * Flush and invalidate all dirty buffers. If another process is already + * doing the flush, just wait for completion. + */ +int +fuse_io_invalbuf(struct vnode *vp, struct thread *td) +{ + struct fuse_vnode_data *fvdat = VTOFUD(vp); + int error = 0; + + if (vp->v_iflag & VI_DOOMED) + return 0; + + ASSERT_VOP_ELOCKED(vp, "fuse_io_invalbuf"); + + while (fvdat->flag & FN_FLUSHINPROG) { + struct proc *p = td->td_proc; + if (vp->v_mount->mnt_kern_flag & MNTK_UNMOUNTF) + return EIO; + fvdat->flag |= FN_FLUSHWANT; + tsleep(&fvdat->flag, PRIBIO + 2, "fusevinv", 2 * hz); + error = 0; + if (p != NULL) { + PROC_LOCK(p); + if (SIGNOTEMPTY(p->p_siglist) || + SIGNOTEMPTY(td->td_siglist)) + error = EINTR; + PROC_UNLOCK(p); + } + if (error == EINTR) + return EINTR; + } + fvdat->flag |= FN_FLUSHINPROG; + + if (vp->v_bufobj.bo_object != NULL) { + VM_OBJECT_LOCK(vp->v_bufobj.bo_object); + vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); + VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object); + } + + error = vinvalbuf(vp, V_SAVE, PCATCH, 0); + while (error) { + if (error == ERESTART || error == EINTR) { + fvdat->flag &= ~FN_FLUSHINPROG; + if (fvdat->flag & FN_FLUSHWANT) { + fvdat->flag &= ~FN_FLUSHWANT; + wakeup(&fvdat->flag); + } + return EINTR; + } + error = vinvalbuf(vp, V_SAVE, PCATCH, 0); + } + fvdat->flag &= ~FN_FLUSHINPROG; + if (fvdat->flag & FN_FLUSHWANT) { + fvdat->flag &= ~FN_FLUSHWANT; + wakeup(&fvdat->flag); + } + return (error); +} ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#10 (text+ko) ==== @@ -4,5 +4,6 @@ int fuse_io_dispatch(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred); int fuse_io_strategy(struct vnode *vp, struct buf *bp); +int fuse_io_invalbuf(struct vnode *vp, struct thread *td); #endif /* _FUSE_IO_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#16 (text+ko) ==== @@ -228,6 +228,68 @@ return fuse_timespec_cmp(&uptsp, &fvdat->cached_attrs_valid, <=); } +int +fuse_vnode_extend(struct vnode *vp, struct ucred *cred, off_t newsize) +{ + struct thread *td = curthread; + struct fuse_filehandle *fufh = NULL; + struct fuse_dispatcher fdi; + struct fuse_setattr_in *fsai; + struct fuse_access_param facp; + int err = 0; + + DEBUG("inode=%jd oldsize=%jd newsize=%jd\n", + VTOI(vp), VTOFUD(vp)->filesize, newsize); + ASSERT_VOP_ELOCKED(vp, "fuse_io_extend"); + MPASS(newsize > VTOFUD(vp)->filesize); + + if (fuse_isdeadfs(vp)) { + return EBADF; + } + + if (vnode_vtype(vp) == VDIR) { + return EISDIR; + } + + if (vfs_isrdonly(vnode_mount(vp))) { + return EROFS; + } + + if (cred == NULL) { + cred = td->td_ucred; + } + + fdisp_init(&fdi, sizeof(*fsai)); + fdisp_make_vp(&fdi, FUSE_SETATTR, vp, td, cred); + fsai = fdi.indata; + fsai->valid = 0; + + bzero(&facp, sizeof(facp)); + facp.xuid = cred->cr_uid; + facp.xgid = cred->cr_gid; + + // Truncate to a new value. + fsai->size = newsize; + fsai->valid |= FATTR_SIZE; + + fuse_filehandle_getrw(vp, FUFH_WRONLY, &fufh); + if (fufh) { + fsai->fh = fufh->fh_id; + fsai->valid |= FATTR_FH; + } + + err = fdisp_wait_answ(&fdi); + + fuse_ticket_drop(fdi.tick); + + fuse_invalidate_attr(vp); + if (!err) { + fuse_vnode_setsize(vp, cred, newsize); + } + + return err; +} + void fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred) { @@ -241,10 +303,22 @@ } void -fuse_vnode_setsize(struct vnode *vp, off_t newsize) +fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize) { struct fuse_vnode_data *fvdat = VTOFUD(vp); + off_t oldsize; + + DEBUG("inode=%jd oldsize=%jd newsize=%jd\n", + VTOI(vp), fvdat->filesize, newsize); + ASSERT_VOP_ELOCKED(vp, "fuse_vnode_setsize"); + oldsize = fvdat->filesize; + fvdat->filesize = newsize; + + if (newsize < oldsize) { + vtruncbuf(vp, cred, curthread, newsize, fuse_iosize(vp)); + } + vnode_pager_setsize(vp, newsize); - fvdat->filesize = newsize; + fuse_invalidate_attr(vp); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#16 (text+ko) ==== @@ -13,6 +13,8 @@ #define FN_CREATING 0x00000002 #define FN_REVOKED 0x00000020 +#define FN_FLUSHINPROG 0x00000040 +#define FN_FLUSHWANT 0x00000080 struct fuse_vnode_data { /** self **/ @@ -103,8 +105,10 @@ int32_t fuse_open_flags, struct thread *td); +int fuse_vnode_extend(struct vnode *vp, struct ucred *cred, off_t newsize); + void fuse_vnode_refreshsize(struct vnode *vp, struct ucred *cred); -void fuse_vnode_setsize(struct vnode *vp, off_t newsize); +void fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize); #endif /* _FUSE_NODE_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#38 (text+ko) ==== @@ -522,7 +522,7 @@ off_t new_filesize = ((struct fuse_attr_out *)fdi.answ)->attr.size; if (fvdat->filesize != new_filesize) { - fuse_vnode_setsize(vp, new_filesize); + fuse_vnode_setsize(vp, cred, new_filesize); } } @@ -574,13 +574,17 @@ struct fuse_vnode_data *fvdat = VTOFUD(vp); struct fuse_filehandle *fufh = NULL; - int type; + int type, need_invalbuf = 1; DEBUG("inode=%jd\n", (uintmax_t)VTOI(vp)); for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); if (FUFH_IS_VALID(fufh)) { + if (need_invalbuf) { + fuse_io_invalbuf(vp, td); + need_invalbuf = 0; + } fuse_filehandle_close(vp, type, td, NULL, FUSE_OP_BACKGROUNDED); } } @@ -1710,7 +1714,7 @@ fuse_ticket_drop(fdi.tick); if (!err && sizechanged) { fuse_invalidate_attr(vp); - fuse_vnode_setsize(vp, newsize); + fuse_vnode_setsize(vp, cred, newsize); } return err;