c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix dprintf format specifiers

Browse Source 
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 <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Ned Bass 2014-10-23 16:59:27 -07:00 committed by Brian Behlendorf
parent 59ec819a0c
commit 29e57d15c8
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/arc.c
View File

@ -1928,7 +1928,7 @@ top:
if (bytes_evicted < bytes) if (bytes_evicted < bytes)
dprintf("only evicted %lld bytes from %x\n", dprintf("only evicted %lld bytes from %x\n",
(longlong_t)bytes_evicted, state); (longlong_t)bytes_evicted, state->arcs_state);
if (skipped) if (skipped)
ARCSTAT_INCR(arcstat_evict_skip, skipped); ARCSTAT_INCR(arcstat_evict_skip, skipped);

2
module/zfs/bptree.c
View File

@ -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) if (zfs_free_leak_on_eio)
flags |= TRAVERSE_HARD; 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", "bookmark %lld/%lld/%lld/%lld",
i, (longlong_t)bte.be_birth_txg, i, (longlong_t)bte.be_birth_txg,
(longlong_t)bte.be_zb.zb_objset, (longlong_t)bte.be_zb.zb_objset,

2
module/zfs/space_map.c
View File

@ -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_bonus_size != sizeof (space_map_phys_t)) ||
doi.doi_data_block_size != space_map_blksz) { doi.doi_data_block_size != space_map_blksz) {
zfs_dbgmsg("txg %llu, spa %s, reallocating: " 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); spa_name(spa), doi.doi_bonus_size, doi.doi_data_block_size);
space_map_free(sm, tx); space_map_free(sm, tx);

2
module/zfs/zap.c
View File

@ -209,7 +209,7 @@ zap_table_grow(zap_t *zap, zap_table_phys_t *tbl,
tbl->zt_nextblk = 0; tbl->zt_nextblk = 0;
tbl->zt_blks_copied = 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)); tbl->zt_numblks, 1<<(tbl->zt_shift-10));
} }

5
module/zfs/zfs_vfsops.c
View File

@ -1436,7 +1436,7 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp)
gen_mask = -1ULL >> (64 - 8 * i); 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))) { if ((err = zfs_zget(zsb, object, &zp))) {
ZFS_EXIT(zsb); ZFS_EXIT(zsb);
return (err); return (err);
@ -1447,7 +1447,8 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp)
if (zp_gen == 0) if (zp_gen == 0)
zp_gen = 1; zp_gen = 1;
if (zp->z_unlinked || zp_gen != fid_gen) { 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)); iput(ZTOI(zp));
ZFS_EXIT(zsb); ZFS_EXIT(zsb);
return (SET_ERROR(EINVAL)); return (SET_ERROR(EINVAL));