diff options
| author | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-21 13:49:26 +0000 |
| commit | 2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c (patch) | |
| tree | bb5f550a5fd2ee1357495987f5076839273e5998 /sys/geom/journal/g_journal.c | |
| parent | f393760a8a7c87242739a64002290b7bda94cb27 (diff) | |
| parent | 579b7ad49fdbcb4dd1e016603c5d0774b32c12d1 (diff) | |
| download | FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.zip FreeBSD-src-2e1a0cbbd8f5a5ca7ec73c85311451ed1ac4242c.tar.gz | |
Merge ^/head r295601 through r295844.
Diffstat (limited to 'sys/geom/journal/g_journal.c')
| -rw-r--r-- | sys/geom/journal/g_journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index f0eb103..f0b07b2 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -1296,7 +1296,7 @@ g_journal_flush(struct g_journal_softc *sc) data = bp->bio_data; if (sc->sc_flags & GJF_DEVICE_CHECKSUM) MD5Update(&ctx, data, ent->je_length); - bzero(bp, sizeof(*bp)); + g_reset_bio(bp); bp->bio_cflags = GJ_BIO_JOURNAL; bp->bio_offset = ent->je_offset; bp->bio_joffset = ent->je_joffset; @@ -1772,7 +1772,7 @@ g_journal_sync_read(struct g_consumer *cp, struct bio *bp, off_t offset, { int error; - bzero(bp, sizeof(*bp)); + g_reset_bio(bp); bp->bio_cmd = BIO_READ; bp->bio_done = NULL; bp->bio_offset = offset; |
