diff options
| author | mav <mav@FreeBSD.org> | 2015-04-09 13:09:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-04-09 13:09:05 +0000 |
| commit | 2e38078077c5e0f74c769cb66f0ecaa931f8186e (patch) | |
| tree | 92cfec1ca24ab35cbb70a7a57690f18851f4d602 /sys/vm/swap_pager.c | |
| parent | 1af0fcc87ba7c58849e9f6ad9e0d7a8f8ace2e4d (diff) | |
| download | FreeBSD-src-2e38078077c5e0f74c769cb66f0ecaa931f8186e.zip FreeBSD-src-2e38078077c5e0f74c769cb66f0ecaa931f8186e.tar.gz | |
Remove sleeps from geom_up thread on device destruction.
MFC after: 3 days.
Diffstat (limited to 'sys/vm/swap_pager.c')
| -rw-r--r-- | sys/vm/swap_pager.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 435f412..55e02c4 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2579,7 +2579,6 @@ swapgeom_done(struct bio *bp2) struct swdevt *sp; struct buf *bp; struct g_consumer *cp; - int destroy; bp = bp2->bio_caller2; cp = bp2->bio_from; @@ -2590,15 +2589,14 @@ swapgeom_done(struct bio *bp2) bp->b_error = bp2->bio_error; bufdone(bp); mtx_lock(&sw_dev_mtx); - destroy = ((--cp->index) == 0 && cp->private); - if (destroy) { - sp = bp2->bio_caller1; - sp->sw_id = NULL; + if ((--cp->index) == 0 && cp->private) { + if (g_post_event(swapgeom_close_ev, cp, M_NOWAIT, NULL) == 0) { + sp = bp2->bio_caller1; + sp->sw_id = NULL; + } } mtx_unlock(&sw_dev_mtx); g_destroy_bio(bp2); - if (destroy) - g_waitfor_event(swapgeom_close_ev, cp, M_WAITOK, NULL); } static void |
