git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix kstat xuio
[zfs.git]
/
module
/
zfs
/
zil.c
diff --git
a/module/zfs/zil.c
b/module/zfs/zil.c
index
e89a24e
..
3c18d43
100644
(file)
--- a/
module/zfs/zil.c
+++ b/
module/zfs/zil.c
@@
-296,6
+296,8
@@
zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,
char *lrbuf, *lrp;
int error = 0;
char *lrbuf, *lrp;
int error = 0;
+ bzero(&next_blk, sizeof(blkptr_t));
+
/*
* Old logs didn't record the maximum zh_claim_lr_seq.
*/
/*
* Old logs didn't record the maximum zh_claim_lr_seq.
*/
@@
-317,7
+319,7
@@
zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func,
for (blk = zh->zh_log; !BP_IS_HOLE(&blk); blk = next_blk) {
uint64_t blk_seq = blk.blk_cksum.zc_word[ZIL_ZC_SEQ];
int reclen;
for (blk = zh->zh_log; !BP_IS_HOLE(&blk); blk = next_blk) {
uint64_t blk_seq = blk.blk_cksum.zc_word[ZIL_ZC_SEQ];
int reclen;
- char *end;
+ char *end
= NULL
;
if (blk_seq > claim_blk_seq)
break;
if (blk_seq > claim_blk_seq)
break;
@@
-1299,7
+1301,7
@@
zil_clean(zilog_t *zilog, uint64_t synced_txg)
* created a bad performance problem.
*/
if (taskq_dispatch(zilog->zl_clean_taskq,
* created a bad performance problem.
*/
if (taskq_dispatch(zilog->zl_clean_taskq,
- (void (*)(void *))zil_itxg_clean, clean_me, TQ_NOSLEEP) ==
NULL
)
+ (void (*)(void *))zil_itxg_clean, clean_me, TQ_NOSLEEP) ==
0
)
zil_itxg_clean(clean_me);
}
zil_itxg_clean(clean_me);
}
@@
-1421,7
+1423,7
@@
zil_commit_writer(zilog_t *zilog)
}
DTRACE_PROBE1(zil__cw1, zilog_t *, zilog);
}
DTRACE_PROBE1(zil__cw1, zilog_t *, zilog);
- while (
itx = list_head(&zilog->zl_itx_commit_list
)) {
+ while (
(itx = list_head(&zilog->zl_itx_commit_list)
)) {
txg = itx->itx_lr.lrc_txg;
ASSERT(txg);
txg = itx->itx_lr.lrc_txg;
ASSERT(txg);