diff options
| author | Brian Behlendorf <[email protected]> | 2009-03-12 10:37:11 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-03-12 10:37:11 -0700 |
| commit | 387b58d93e6f85ba8d9b110eeeb278a04eb21bf6 (patch) | |
| tree | 9a49bd71ee60c9654b7870de12d4756c4fb0e716 /module | |
| parent | 61980f28b85b0d3916d82410051c889f1c3c9ef9 (diff) | |
| parent | f8fe8a76f4a1422d105fbcb9ec9c33001a3c1c92 (diff) | |
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/arc.c | 2 | ||||
| -rw-r--r-- | module/zfs/dmu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 31b337b0f..bdb5e8b32 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -2607,7 +2607,7 @@ top: uint64_t size = BP_GET_LSIZE(bp); arc_callback_t *acb; vdev_t *vd = NULL; - daddr_t addr; + daddr_t addr = -1; boolean_t devw = B_FALSE; if (hdr == NULL) { diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c index 52373e8b6..b1f3bea77 100644 --- a/module/zfs/dmu.c +++ b/module/zfs/dmu.c @@ -189,7 +189,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint32_t flags; int err; zio_t *zio; - hrtime_t start; + hrtime_t start = 0; ASSERT(length <= DMU_MAX_ACCESS); |