diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
| commit | a1b5b02d283a933de7f074a68398486a187f7e67 (patch) | |
| tree | e2b2b71ff380bf5663f7063501c0a991617e6d2a /usr/src/uts/common/os/bio.c | |
| parent | 7662705473b5736c9bcb3d7ace7cd1ae5c2f784d (diff) | |
| parent | fdff6cea3adcb1f377a673bc22c427ce25917f05 (diff) | |
| download | illumos-joyent-release-20161208.tar.gz | |
[illumos-gate merge]release-20161208
commit fdff6cea3adcb1f377a673bc22c427ce25917f05
7652 libficl build should depend on libuuid
commit 3f11de9ddb9e8b567df284c7f495ac53076611c4
7605 we should not attempt to write to ZFS while panicing
Diffstat (limited to 'usr/src/uts/common/os/bio.c')
| -rw-r--r-- | usr/src/uts/common/os/bio.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/uts/common/os/bio.c b/usr/src/uts/common/os/bio.c index b8d2e29058..8350d5f2f9 100644 --- a/usr/src/uts/common/os/bio.c +++ b/usr/src/uts/common/os/bio.c @@ -24,6 +24,10 @@ * Copyright 2011 Joyent, Inc. All rights reserved. */ +/* + * Copyright (c) 2016 by Delphix. All rights reserved. + */ + /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -293,7 +297,7 @@ breada(dev_t dev, daddr_t blkno, daddr_t rablkno, long bsize) */ void bwrite_common(void *arg, struct buf *bp, int force_wait, - int do_relse, int clear_flags) + int do_relse, int clear_flags) { register int do_wait; struct ufsvfs *ufsvfsp = (struct ufsvfs *)arg; @@ -528,7 +532,6 @@ bio_busy(int cleanit) kmutex_t *hmp; for (i = 0; i < v.v_hbuf; i++) { - vfs_syncprogress(); dp = (struct buf *)&hbuf[i]; hmp = &hbuf[i].b_lock; @@ -887,7 +890,6 @@ bflush(dev_t dev) * candidates on the delwri_list and then drop the hash locks. */ for (i = 0; i < v.v_hbuf; i++) { - vfs_syncprogress(); hmp = &hbuf[i].b_lock; dp = (struct buf *)&dwbuf[i]; mutex_enter(hmp); @@ -908,7 +910,6 @@ bflush(dev_t dev) * and write back all the buffers that have B_DELWRI set. */ while (delwri_list != EMPTY_LIST) { - vfs_syncprogress(); bp = delwri_list; sema_p(&bp->b_sem); /* may block */ |