diff options
| author | kib <kib@FreeBSD.org> | 2015-08-14 12:23:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-08-14 12:23:20 +0000 |
| commit | 8c79292e68ced68981082556ae3e26e2d8bf01f4 (patch) | |
| tree | 531d0c5a898f0b0e95fcf569c95736f67552ee19 /sys/geom | |
| parent | 8445fe493e52fb647548d114f983df1bc7a99b23 (diff) | |
| download | FreeBSD-src-8c79292e68ced68981082556ae3e26e2d8bf01f4.zip FreeBSD-src-8c79292e68ced68981082556ae3e26e2d8bf01f4.tar.gz | |
MFC r286404:
The condition to use direct processing for the unmapped bio is reverted.
MFC r286405:
Minor style cleanup of the code surrounding r286404.
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/geom_io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 0b8e118..e72e709 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -517,11 +517,11 @@ g_io_request(struct bio *bp, struct g_consumer *cp) 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; |
