svn commit: r191790 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb geom

[Ulf Lilleengen]

Author: lulf
Date: Mon May  4 18:35:52 2009
New Revision: 191790
URL: http://svn.freebsd.org/changeset/base/191790

Log:
  MFC r179094:
  Play nice with DDB pager.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/geom/geom_subr.c

Modified: stable/7/sys/geom/geom_subr.c
==============================================================================
--- stable/7/sys/geom/geom_subr.c       Mon May  4 18:14:45 2009        
(r191789)
+++ stable/7/sys/geom/geom_subr.c       Mon May  4 18:35:52 2009        
(r191790)
@@ -1157,8 +1157,11 @@ db_show_geom_provider(int indent, struct
                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;
+               }
        }
 }
 
@@ -1189,12 +1192,18 @@ db_show_geom_geom(int indent, struct g_g
                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;
+               }
        }
 }
 
@@ -1204,8 +1213,11 @@ db_show_geom_class(struct g_class *mp)
        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;
+       }
 }
 
 /*
@@ -1220,6 +1232,8 @@ DB_SHOW_COMMAND(geom, db_show_geom)
                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)) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"