From owner-svn-src-stable-10@freebsd.org  Fri Aug 14 12:23:21 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B137A99FF93;
 Fri, 14 Aug 2015 12:23:21 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A1C5C1283;
 Fri, 14 Aug 2015 12:23:21 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7ECNLvc025095;
 Fri, 14 Aug 2015 12:23:21 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7ECNLWc025094;
 Fri, 14 Aug 2015 12:23:21 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201508141223.t7ECNLWc025094@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 14 Aug 2015 12:23:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286772 - stable/10/sys/geom
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2015 12:23:21 -0000

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;