diff options
| author | Ned Bass <[email protected]> | 2014-10-23 16:59:27 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-11-17 11:13:45 -0800 |
| commit | 29e57d15c8cdd5d1d7905c9045e8f40c6f9b72f4 (patch) | |
| tree | 4ca31ff732d93938f5242295c1349ef34761f0a4 | |
| parent | 59ec819a0c616fe2ac2b28829086568353a7d7fe (diff) | |
Fix dprintf format specifiers
Fix a few dprintf format specifiers that disagreed with their argument
types. These came to light as compiler errors when converting dprintf
to use the Linux trace buffer. Previously this wasn't a problem,
presumably because the SPL debug logging uses vsnprintf which must
perform automatic type conversion.
Signed-off-by: Ned Bass <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | module/zfs/arc.c | 2 | ||||
| -rw-r--r-- | module/zfs/bptree.c | 2 | ||||
| -rw-r--r-- | module/zfs/space_map.c | 2 | ||||
| -rw-r--r-- | module/zfs/zap.c | 2 | ||||
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 5 |
5 files changed, 7 insertions, 6 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 148b208a8..fd593a13e 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -1928,7 +1928,7 @@ top: if (bytes_evicted < bytes) dprintf("only evicted %lld bytes from %x\n", - (longlong_t)bytes_evicted, state); + (longlong_t)bytes_evicted, state->arcs_state); if (skipped) ARCSTAT_INCR(arcstat_evict_skip, skipped); diff --git a/module/zfs/bptree.c b/module/zfs/bptree.c index 61fa17f6e..0eafa4d7d 100644 --- a/module/zfs/bptree.c +++ b/module/zfs/bptree.c @@ -221,7 +221,7 @@ bptree_iterate(objset_t *os, uint64_t obj, boolean_t free, bptree_itor_t func, if (zfs_free_leak_on_eio) flags |= TRAVERSE_HARD; - zfs_dbgmsg("bptree index %d: traversing from min_txg=%lld " + zfs_dbgmsg("bptree index %lld: traversing from min_txg=%lld " "bookmark %lld/%lld/%lld/%lld", i, (longlong_t)bte.be_birth_txg, (longlong_t)bte.be_zb.zb_objset, diff --git a/module/zfs/space_map.c b/module/zfs/space_map.c index 0ceccf669..fc0df756e 100644 --- a/module/zfs/space_map.c +++ b/module/zfs/space_map.c @@ -427,7 +427,7 @@ space_map_truncate(space_map_t *sm, dmu_tx_t *tx) doi.doi_bonus_size != sizeof (space_map_phys_t)) || doi.doi_data_block_size != space_map_blksz) { zfs_dbgmsg("txg %llu, spa %s, reallocating: " - "old bonus %u, old blocksz %u", dmu_tx_get_txg(tx), + "old bonus %llu, old blocksz %u", dmu_tx_get_txg(tx), spa_name(spa), doi.doi_bonus_size, doi.doi_data_block_size); space_map_free(sm, tx); diff --git a/module/zfs/zap.c b/module/zfs/zap.c index 02c92748f..4ee75b6d9 100644 --- a/module/zfs/zap.c +++ b/module/zfs/zap.c @@ -209,7 +209,7 @@ zap_table_grow(zap_t *zap, zap_table_phys_t *tbl, tbl->zt_nextblk = 0; tbl->zt_blks_copied = 0; - dprintf("finished; numblocks now %llu (%lluk entries)\n", + dprintf("finished; numblocks now %llu (%uk entries)\n", tbl->zt_numblks, 1<<(tbl->zt_shift-10)); } diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index eea78417a..d67f11eca 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -1436,7 +1436,7 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp) gen_mask = -1ULL >> (64 - 8 * i); - dprintf("getting %llu [%u mask %llx]\n", object, fid_gen, gen_mask); + dprintf("getting %llu [%llu mask %llx]\n", object, fid_gen, gen_mask); if ((err = zfs_zget(zsb, object, &zp))) { ZFS_EXIT(zsb); return (err); @@ -1447,7 +1447,8 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp) if (zp_gen == 0) zp_gen = 1; if (zp->z_unlinked || zp_gen != fid_gen) { - dprintf("znode gen (%u) != fid gen (%u)\n", zp_gen, fid_gen); + dprintf("znode gen (%llu) != fid gen (%llu)\n", zp_gen, + fid_gen); iput(ZTOI(zp)); ZFS_EXIT(zsb); return (SET_ERROR(EINVAL)); |