diff options
| author | delphij <delphij@FreeBSD.org> | 2014-05-09 06:56:26 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-05-09 06:56:26 +0000 |
| commit | 0fce5e81cc639e45df5a18337cbee810899a3da5 (patch) | |
| tree | 1e3998496e42e4baa86a463572366f2d21ce1d90 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c | |
| parent | 0104c2c14cdd6cf82f8fd66db10ee9b3efa5c97c (diff) | |
| download | FreeBSD-src-0fce5e81cc639e45df5a18337cbee810899a3da5.zip FreeBSD-src-0fce5e81cc639e45df5a18337cbee810899a3da5.tar.gz | |
MFC r264669: MFV r264666:
4374 dn_free_ranges should use range_tree_t
illumos/illumos-gate@bf16b11e8deb633dd6c4296d46e92399d1582df4
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c index c660f23..4e88a53 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. */ #include <sys/zio.h> @@ -380,7 +380,7 @@ mzap_open(objset_t *os, uint64_t obj, dmu_buf_t *db) if (*(uint64_t *)db->db_data != ZBT_MICRO) { mutex_init(&zap->zap_f.zap_num_entries_mtx, 0, 0, 0); - zap->zap_f.zap_block_shift = highbit(db->db_size) - 1; + zap->zap_f.zap_block_shift = highbit64(db->db_size) - 1; } else { zap->zap_ismicro = TRUE; } |
