Deleted Added
full compact
zil.c (276081) zil.c (277586)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 179 unchanged lines hidden (view full) ---

188/*
189 * Read a log block and make sure it's valid.
190 */
191static int
192zil_read_log_block(zilog_t *zilog, const blkptr_t *bp, blkptr_t *nbp, void *dst,
193 char **end)
194{
195 enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 179 unchanged lines hidden (view full) ---

188/*
189 * Read a log block and make sure it's valid.
190 */
191static int
192zil_read_log_block(zilog_t *zilog, const blkptr_t *bp, blkptr_t *nbp, void *dst,
193 char **end)
194{
195 enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
196 uint32_t aflags = ARC_WAIT;
196 arc_flags_t aflags = ARC_FLAG_WAIT;
197 arc_buf_t *abuf = NULL;
198 zbookmark_phys_t zb;
199 int error;
200
201 if (zilog->zl_header->zh_claim_txg == 0)
202 zio_flags |= ZIO_FLAG_SPECULATIVE | ZIO_FLAG_SCRUB;
203
204 if (!(zilog->zl_header->zh_flags & ZIL_CLAIM_LR_SEQ_VALID))

--- 59 unchanged lines hidden (view full) ---

264/*
265 * Read a TX_WRITE log data block.
266 */
267static int
268zil_read_log_data(zilog_t *zilog, const lr_write_t *lr, void *wbuf)
269{
270 enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
271 const blkptr_t *bp = &lr->lr_blkptr;
197 arc_buf_t *abuf = NULL;
198 zbookmark_phys_t zb;
199 int error;
200
201 if (zilog->zl_header->zh_claim_txg == 0)
202 zio_flags |= ZIO_FLAG_SPECULATIVE | ZIO_FLAG_SCRUB;
203
204 if (!(zilog->zl_header->zh_flags & ZIL_CLAIM_LR_SEQ_VALID))

--- 59 unchanged lines hidden (view full) ---

264/*
265 * Read a TX_WRITE log data block.
266 */
267static int
268zil_read_log_data(zilog_t *zilog, const lr_write_t *lr, void *wbuf)
269{
270 enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
271 const blkptr_t *bp = &lr->lr_blkptr;
272 uint32_t aflags = ARC_WAIT;
272 arc_flags_t aflags = ARC_FLAG_WAIT;
273 arc_buf_t *abuf = NULL;
274 zbookmark_phys_t zb;
275 int error;
276
277 if (BP_IS_HOLE(bp)) {
278 if (wbuf != NULL)
279 bzero(wbuf, MAX(BP_GET_LSIZE(bp), lr->lr_length));
280 return (0);

--- 1867 unchanged lines hidden ---
273 arc_buf_t *abuf = NULL;
274 zbookmark_phys_t zb;
275 int error;
276
277 if (BP_IS_HOLE(bp)) {
278 if (wbuf != NULL)
279 bzero(wbuf, MAX(BP_GET_LSIZE(bp), lr->lr_length));
280 return (0);

--- 1867 unchanged lines hidden ---