From owner-p4-projects@FreeBSD.ORG Wed Feb 1 16:43:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8595016A423; Wed, 1 Feb 2006 16:43:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40FB516A420 for ; Wed, 1 Feb 2006 16:43:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C648243D46 for ; Wed, 1 Feb 2006 16:43:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k11GhGvH073833 for ; Wed, 1 Feb 2006 16:43:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11GhG1n073830 for perforce@freebsd.org; Wed, 1 Feb 2006 16:43:16 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Feb 2006 16:43:16 GMT Message-Id: <200602011643.k11GhG1n073830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 16:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90886 Change 90886 by jhb@jhb_slimer on 2006/02/01 16:42:32 IFC @90559. Affected files ... .. //depot/projects/smpng/sys/dev/em/if_em.c#64 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#119 integrate .. //depot/projects/smpng/sys/sys/_rwlock.h#1 branch Differences ... ==== //depot/projects/smpng/sys/dev/em/if_em.c#64 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.103 2006/01/22 01:06:55 mux Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.104 2006/01/28 15:50:19 scottl Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -2324,7 +2324,7 @@ size, /* maxsize */ 1, /* nsegments */ size, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &dma->dma_tag); ==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#22 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.22 2006/01/27 22:24:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.23 2006/01/28 00:49:31 imp Exp $"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" @@ -853,7 +853,9 @@ { struct sleepqueue_chain *sc; struct sleepqueue *sq; +#ifdef INVARIANTS struct lock_object *lock; +#endif struct thread *td; void *wchan; int i; ==== //depot/projects/smpng/sys/kern/vfs_subr.c#119 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.655 2006/01/21 19:42:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.656 2006/01/28 03:06:35 kris Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -1920,7 +1920,6 @@ { int oweinact; int oldflags; - int usecount; int error; error = 0; @@ -1942,7 +1941,6 @@ flags |= LK_EXCLUSIVE; oweinact = 1; } - usecount = vp->v_usecount; v_incr_usecount(vp); if ((error = vn_lock(vp, flags | LK_INTERLOCK, td)) != 0) { VI_LOCK(vp); @@ -1953,24 +1951,6 @@ * active. */ v_decr_usecount(vp); - /* - * Print warning when race below occur: - * - * thread1 thread2 - * ------- ------- - * v_usecount=0 - * vref(vp) v_usecount=1 - * vget(vp) - * v_incr_usecount(vp) v_usecount=2 - * vn_lock(vp) - * vrele(vp) v_usecount=1 - * v_decr_usecount(vp) v_usecount=0 - * - * In such situation VOP_INACTIVE() will not be called for - * the vnode vp. - */ - if (usecount > 0 && vp->v_usecount == 0) - printf("vinactive() won't be called for vp=%p\n", vp); return (error); } if (vp->v_iflag & VI_DOOMED && (flags & LK_RETRY) == 0)