aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/zfs/sa.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-06-26 00:21:11 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-06-26 00:21:11 +0000
commit33b8c039a960bcff3471baf5929558c4d1500727 (patch)
tree9627538080dac1f018cb190aa9a245cabce277ed /sys/contrib/openzfs/module/zfs/sa.c
parentec8004dd419d8c8acfc9025dd050f141c949d53a (diff)
parent5e2c8338bf17d31b44eb1dbbb3c9b6a0f64e96ee (diff)
downloadsrc-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/sa.c')
-rw-r--r--sys/contrib/openzfs/module/zfs/sa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/zfs/sa.c b/sys/contrib/openzfs/module/zfs/sa.c
index 5af0aaa7d0aa..2604a7513ecf 100644
--- a/sys/contrib/openzfs/module/zfs/sa.c
+++ b/sys/contrib/openzfs/module/zfs/sa.c
@@ -1292,7 +1292,7 @@ sa_build_index(sa_handle_t *hdl, sa_buf_type_t buftype)
mutex_exit(&sa->sa_lock);
zfs_dbgmsg("Buffer Header: %x != SA_MAGIC:%x "
"object=%#llx\n", sa_hdr_phys->sa_magic, SA_MAGIC,
- db->db.db_object);
+ (u_longlong_t)db->db.db_object);
return (SET_ERROR(EIO));
}
sa_byteswap(hdl, buftype);