Skip to content

Upstream: fix linkage on macOS 12 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ilovezfs wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

Upstream: fix linkage on macOS 12 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/zdb/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ zdb_SOURCES = \
zdb_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libzfs/libzfs.la

include $(top_srcdir)/config/CppCheck.am
3 changes: 2 additions & 1 deletion cmd/zhack/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ zhack_SOURCES = \
zhack_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libzfs/libzfs.la

include $(top_srcdir)/config/CppCheck.am
3 changes: 2 additions & 1 deletion cmd/ztest/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ ztest_SOURCES = \
ztest_LDADD = \
$(abs_top_builddir)/lib/libzpool/libzpool.la \
$(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \
$(abs_top_builddir)/lib/libnvpair/libnvpair.la
$(abs_top_builddir)/lib/libnvpair/libnvpair.la \
$(abs_top_builddir)/lib/libzfs/libzfs.la

ztest_LDADD += -lm
ztest_LDFLAGS = -pthread
Expand Down
2 changes: 1 addition & 1 deletion include/sys/zio_crypt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int zio_crypt_do_hmac(zio_crypt_key_t *key, uint8_t *data, uint_t datalen,
uint8_t *digestbuf, uint_t digestlen);
int zio_crypt_do_objset_hmacs(zio_crypt_key_t *key, void *data, uint_t datalen,
boolean_t byteswap, uint8_t *portable_mac, uint8_t *local_mac);
#ifdef __APPLE__
#if defined(__APPLE__) && defined(_KERNEL)
int zio_crypt_do_objset_hmacs_errata1(zio_crypt_key_t *key, void *data,
uint_t datalen, boolean_t should_bswap, uint8_t *portable_mac,
uint8_t *local_mac);
Expand Down
3 changes: 3 additions & 0 deletions lib/libicp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ ASM_SOURCES_AS = \
asm-x86_64/os/macos/aes/aes_amd64.S \
asm-x86_64/os/macos/aes/aes_aesni.S \
asm-x86_64/os/macos/modes/gcm_pclmulqdq.S \
asm-x86_64/os/macos/modes/aesni-gcm-x86_64.S \
asm-x86_64/os/macos/modes/ghash-x86_64.S \
asm-x86_64/os/macos/sha1/sha1-x86_64.S \
asm-x86_64/os/macos/sha2/sha256_impl.S \
asm-x86_64/os/macos/sha2/sha512_impl.S
else
Expand Down
14 changes: 0 additions & 14 deletions module/os/macos/zfs/zfs_vnops_osx_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2219,17 +2219,3 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
{
return (0);
}

/* No #pragma weaks here! */
void
dmu_buf_add_ref(dmu_buf_t *db, void *tag)
{
dbuf_add_ref((dmu_buf_impl_t *)db, tag);
}

boolean_t
dmu_buf_try_add_ref(dmu_buf_t *db, objset_t *os, uint64_t object,
uint64_t blkid, void *tag)
{
return (dbuf_try_add_ref(db, os, object, blkid, tag));
}
16 changes: 14 additions & 2 deletions module/zfs/dbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3544,15 +3544,14 @@ dbuf_rm_spill(dnode_t *dn, dmu_tx_t *tx)
dbuf_free_range(dn, DMU_SPILL_BLKID, DMU_SPILL_BLKID, tx);
}

#pragma weak dmu_buf_add_ref = dbuf_add_ref

void
dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
{
int64_t holds = zfs_refcount_add(&db->db_holds, tag);
VERIFY3S(holds, >, 1);
}

#pragma weak dmu_buf_try_add_ref = dbuf_try_add_ref
boolean_t
dbuf_try_add_ref(dmu_buf_t *db_fake, objset_t *os, uint64_t obj, uint64_t blkid,
void *tag)
Expand All @@ -3576,6 +3575,19 @@ dbuf_try_add_ref(dmu_buf_t *db_fake, objset_t *os, uint64_t obj, uint64_t blkid,
return (result);
}

void
dmu_buf_add_ref(dmu_buf_t *db, void *tag)
{
dbuf_add_ref((dmu_buf_impl_t *)db, tag);
}

boolean_t
dmu_buf_try_add_ref(dmu_buf_t *db, objset_t *os, uint64_t object,
uint64_t blkid, void *tag)
{
return (dbuf_try_add_ref(db, os, object, blkid, tag));
}

/*
* If you call dbuf_rele() you had better not be referencing the dnode handle
* unless you have some other direct or indirect hold on the dnode. (An indirect
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dsl_crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2701,7 +2701,7 @@ spa_do_crypt_objset_mac_abd(boolean_t generate, spa_t *spa, uint64_t dsobj,
return (0);
}

#ifdef __APPLE__
#if defined(__APPLE__) && defined(_KERNEL)
/*
* Unfortunate errata case, see module/os/macos/zfs/zio_crypt.c
* If portable is GOOD, but local_mac is BAD - recompute
Expand Down