This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/module/zfs/zfs_vnops_osx.c b/module/zfs/zfs_vnops_osx.c | |
index 03d2fda..3f913ab 100644 | |
--- a/module/zfs/zfs_vnops_osx.c | |
+++ b/module/zfs/zfs_vnops_osx.c | |
@@ -1427,6 +1427,10 @@ void vnop_reclaim_thread(void *arg) | |
count = 0; | |
#endif | |
+ | |
+ /* If ZIL is closed (suspend_fs), we nede to */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cmd/zed/zed_event.c b/cmd/zed/zed_event.c | |
index e504aef..3eae791 100644 | |
--- a/cmd/zed/zed_event.c | |
+++ b/cmd/zed/zed_event.c | |
@@ -36,6 +36,7 @@ | |
#include <sys/zfs_ioctl.h> | |
#include <time.h> | |
#include <unistd.h> | |
+#include <signal.h> | |
#include "zed.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c | |
index c8065a7..412ad2e 100644 | |
--- a/module/zfs/zfs_znode.c | |
+++ b/module/zfs/zfs_znode.c | |
@@ -1329,6 +1329,11 @@ again: | |
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); | |
getnewvnode_drop_reserve(); | |
+ printf("Waiting on zp %p to die!\n", zp); | |
+ delay(hz>>1); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/module/zfs/arc.c b/module/zfs/arc.c | |
index a26c98d..6ab61c4 100644 | |
--- a/module/zfs/arc.c | |
+++ b/module/zfs/arc.c | |
@@ -2487,6 +2487,32 @@ arc_reclaim_thread(void *dummy __unused) | |
mutex_enter(&arc_reclaim_thr_lock); | |
while (arc_thread_exit == 0) { | |
+#ifdef __APPLE__ | |
+#ifdef _KERNEL |
NewerOlder