diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-06-26 00:21:11 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-06-26 00:21:11 +0000 |
| commit | 33b8c039a960bcff3471baf5929558c4d1500727 (patch) | |
| tree | 9627538080dac1f018cb190aa9a245cabce277ed /sys/contrib/openzfs/module/zfs/dsl_dir.c | |
| parent | ec8004dd419d8c8acfc9025dd050f141c949d53a (diff) | |
| parent | 5e2c8338bf17d31b44eb1dbbb3c9b6a0f64e96ee (diff) | |
| download | src-33b8c039a960bcff3471baf5929558c4d1500727.tar.gz src-33b8c039a960bcff3471baf5929558c4d1500727.zip | |
zfs: merge openzfs/zfs@5e2c8338b (master) into main
Notable upstream pull request merges:
#12183 Optimize small random numbers generation
#12227 Revert Consolidate arc_buf allocation checks
#12266 Fix flag copying in resume case
#12273 zfs_metaslab_mem_limit should be 25 instead of 75
#12276 Update cache file when setting compatibility property
#12280 Help compiller optimize out abd_verify()
#12282 FreeBSD: fix compilation of FreeBSD world after 29274c9f6
Obtained from: OpenZFS
OpenZFS commit: 5e2c8338bf17d31b44eb1dbbb3c9b6a0f64e96ee
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/dsl_dir.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/dsl_dir.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/contrib/openzfs/module/zfs/dsl_dir.c b/sys/contrib/openzfs/module/zfs/dsl_dir.c index 90dd787023be..df2c3d8f0637 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_dir.c +++ b/sys/contrib/openzfs/module/zfs/dsl_dir.c @@ -488,7 +488,7 @@ dsl_dir_hold(dsl_pool_t *dp, const char *name, void *tag, if (next[0] == '@') break; dprintf("looking up %s in obj%lld\n", - buf, dsl_dir_phys(dd)->dd_child_dir_zapobj); + buf, (longlong_t)dsl_dir_phys(dd)->dd_child_dir_zapobj); err = zap_lookup(dp->dp_meta_objset, dsl_dir_phys(dd)->dd_child_dir_zapobj, @@ -1156,8 +1156,8 @@ dsl_dir_sync(dsl_dir_t *dd, dmu_tx_t *tx) mutex_enter(&dd->dd_lock); ASSERT0(dd->dd_tempreserved[tx->tx_txg & TXG_MASK]); - dprintf_dd(dd, "txg=%llu towrite=%lluK\n", tx->tx_txg, - dd->dd_space_towrite[tx->tx_txg & TXG_MASK] / 1024); + dprintf_dd(dd, "txg=%llu towrite=%lluK\n", (u_longlong_t)tx->tx_txg, + (u_longlong_t)dd->dd_space_towrite[tx->tx_txg & TXG_MASK] / 1024); dd->dd_space_towrite[tx->tx_txg & TXG_MASK] = 0; mutex_exit(&dd->dd_lock); @@ -1344,8 +1344,9 @@ top_of_function: retval = ERESTART; dprintf_dd(dd, "failing: used=%lluK inflight = %lluK " "quota=%lluK tr=%lluK err=%d\n", - used_on_disk>>10, est_inflight>>10, - quota>>10, asize>>10, retval); + (u_longlong_t)used_on_disk>>10, + (u_longlong_t)est_inflight>>10, + (u_longlong_t)quota>>10, (u_longlong_t)asize>>10, retval); mutex_exit(&dd->dd_lock); DMU_TX_STAT_BUMP(dmu_tx_quota); return (SET_ERROR(retval)); |