Author: kib
Date: Fri Aug 14 12:23:20 2015
New Revision: 286772
URL: https://svnweb.freebsd.org/changeset/base/286772

Log:
  MFC r286404:
  The condition to use direct processing for the unmapped bio is reverted.
  
  MFC r286405:
  Minor style cleanup of the code surrounding r286404.

Modified:
  stable/10/sys/geom/geom_io.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/geom_io.c
==============================================================================
--- stable/10/sys/geom/geom_io.c        Fri Aug 14 12:08:20 2015        
(r286771)
+++ stable/10/sys/geom/geom_io.c        Fri Aug 14 12:23:20 2015        
(r286772)
@@ -517,11 +517,11 @@ g_io_request(struct bio *bp, struct g_co
                getbinuptime(&bp->bio_t0);
 
 #ifdef GET_STACK_USAGE
-       direct = (cp->flags & G_CF_DIRECT_SEND) &&
-                (pp->flags & G_PF_DIRECT_RECEIVE) &&
-                !g_is_geom_thread(curthread) &&
-                (((pp->flags & G_PF_ACCEPT_UNMAPPED) == 0 &&
-                  (bp->bio_flags & BIO_UNMAPPED) != 0) || THREAD_CAN_SLEEP());
+       direct = (cp->flags & G_CF_DIRECT_SEND) != 0 &&
+           (pp->flags & G_PF_DIRECT_RECEIVE) != 0 &&
+           !g_is_geom_thread(curthread) &&
+           ((pp->flags & G_PF_ACCEPT_UNMAPPED) != 0 ||
+           (bp->bio_flags & BIO_UNMAPPED) == 0 || THREAD_CAN_SLEEP());
        if (direct) {
                /* Block direct execution if less then half of stack left. */
                size_t  st, su;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to