PERFORCE change 141826 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=141826

Change 141826 by jb at freebsd3 on 2008/05/18 22:28:41

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/geom/geom_subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#41 integrate
.. //depot/projects/dtrace/src/sys/sys/kernel.h#21 integrate
.. //depot/projects/dtrace/src/sys/sys/systm.h#20 integrate
.. //depot/projects/dtrace/src/sys/sys/time.h#17 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/geom/geom_subr.c#9 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.93 2008/03/28 06:31:12 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.94 2008/05/18 21:13:10 pjd Exp $");
 
 #include "opt_ddb.h"
 
@@ -1156,8 +1156,11 @@
 		printf("\n");
 	}
 	if (!LIST_EMPTY(&pp->consumers)) {
-		LIST_FOREACH(cp, &pp->consumers, consumers)
+		LIST_FOREACH(cp, &pp->consumers, consumers) {
 			db_show_geom_consumer(indent + 2, cp);
+			if (db_pager_quit)
+				break;
+		}
 	}
 }
 
@@ -1188,12 +1191,18 @@
 		printf("\n");
 	}
 	if (!LIST_EMPTY(&gp->provider)) {
-		LIST_FOREACH(pp, &gp->provider, provider)
+		LIST_FOREACH(pp, &gp->provider, provider) {
 			db_show_geom_provider(indent + 2, pp);
+			if (db_pager_quit)
+				break;
+		}
 	}
 	if (!LIST_EMPTY(&gp->consumer)) {
-		LIST_FOREACH(cp, &gp->consumer, consumer)
+		LIST_FOREACH(cp, &gp->consumer, consumer) {
 			db_show_geom_consumer(indent + 2, cp);
+			if (db_pager_quit)
+				break;
+		}
 	}
 }
 
@@ -1203,8 +1212,11 @@
 	struct g_geom *gp;
 
 	printf("class: %s (%p)\n", mp->name, mp);
-	LIST_FOREACH(gp, &mp->geom, geom)
+	LIST_FOREACH(gp, &mp->geom, geom) {
 		db_show_geom_geom(2, gp);
+		if (db_pager_quit)
+			break;
+	}
 }
 
 /*
@@ -1219,6 +1231,8 @@
 		LIST_FOREACH(mp, &g_classes, class) {
 			db_show_geom_class(mp);
 			printf("\n");
+			if (db_pager_quit)
+				break;
 		}
 	} else {
 		switch (g_valid_obj((void *)addr)) {

==== //depot/projects/dtrace/src/sys/kern/vfs_subr.c#41 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.731 2008/05/04 13:54:55 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.732 2008/05/18 21:08:12 pjd Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
@@ -2715,6 +2715,8 @@
 			    mp->mnt_stat.f_mntfromname,
 			    mp->mnt_stat.f_mntonname,
 			    mp->mnt_stat.f_fstypename);
+			if (db_pager_quit)
+				break;
 		}
 		db_printf("\nMore info: show mount <addr>\n");
 		return;
@@ -2844,8 +2846,11 @@
 	db_printf("\n");
 
 	TAILQ_FOREACH(vp, &mp->mnt_nvnodelist, v_nmntvnodes) {
-		if (vp->v_type != VMARKER)
+		if (vp->v_type != VMARKER) {
 			vn_printf(vp, "vnode ");
+			if (db_pager_quit)
+				break;
+		}
 	}
 }
 #endif	/* DDB */

==== //depot/projects/dtrace/src/sys/sys/kernel.h#21 (text+ko) ====

@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/kernel.h,v 1.140 2008/04/08 17:53:33 sam Exp $
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.141 2008/05/18 22:10:10 jb Exp $
  */
 
 #ifndef _SYS_KERNEL_H_

==== //depot/projects/dtrace/src/sys/sys/systm.h#20 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD: src/sys/sys/systm.h,v 1.265 2008/03/26 20:09:21 phk Exp $
+ * $FreeBSD: src/sys/sys/systm.h,v 1.266 2008/05/18 22:11:47 jb Exp $
  */
 
 #ifndef _SYS_SYSTM_H_

==== //depot/projects/dtrace/src/sys/sys/time.h#17 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/time.h,v 1.77 2008/04/22 19:38:30 phk Exp $
+ * $FreeBSD: src/sys/sys/time.h,v 1.78 2008/05/18 22:11:47 jb Exp $
  */
 
 #ifndef _SYS_TIME_H_