diff options
| author | Brian Behlendorf <[email protected]> | 2009-03-12 10:37:12 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-03-12 10:37:12 -0700 |
| commit | a03187bb3bc611a9b547361d06339db88b254eaf (patch) | |
| tree | 0fb47da001e1259ebf53848d69fbf9b7539da26b /module | |
| parent | 193ea156e9b90a57590751a76ab1bf03b8e24718 (diff) | |
| parent | 387b58d93e6f85ba8d9b110eeeb278a04eb21bf6 (diff) | |
Merge branch 'gcc-branch' into refs/top-bases/zfs-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 9589006d9..ace79ad0a 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -2609,7 +2609,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); |