Correct WIN32 paths after bulk git merge

fix ZVOL blocksize decrease impact of delete delay
openzfsonwindows · May 27, 2019 · 279dc74 · 279dc74
1 parent 9cc1293
commit 279dc74
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/ZFSin/zfs/include/sys/fs/zfs.h b/ZFSin/zfs/include/sys/fs/zfs.h
@@ -1183,8 +1183,6 @@ typedef enum {
 #define SNAP_ITER_MIN_TXG       "snap_iter_min_txg"
 #define SNAP_ITER_MAX_TXG       "snap_iter_max_txg"
 
-#define	ZVOL_DEFAULT_BLOCKSIZE	131072
-
 /*
  * zvol ioctl to get dataset name
  */

diff --git a/ZFSin/zfs/module/zfs/zfs_vnops_windows.c b/ZFSin/zfs/module/zfs/zfs_vnops_windows.c
@@ -257,12 +257,12 @@ NTSTATUS zfs_setunlink(vnode_t *vp, vnode_t *dvp) {
 		// unlinked set but not yet reclaimed.
 		// We could optionally drop our iocount here, and try to take it again
 		// handling the case where it may have been deleted after drain.
-		while (zp->z_size >= 3 && 
+		while (zp->z_size == 3 && 
 			vnode_drain_delayclose(1) >= 1) {
 			dprintf("%s: delete_pending waiting\n", __func__);
-			delay(11);
+			delay(1);
 			// This crutch should not be needed, in theory
-			//if (nodeadlock++ > 10) break;
+			if (nodeadlock++ > 10) break;
 		}
 
 		if (zp->z_size > 2) {

diff --git a/...t/zpool_offline/zpool_offline_003_pos.ksh → ...t/zpool_offline/zpool_offline_003_pos.ksh b/...t/zpool_offline/zpool_offline_003_pos.ksh → ...t/zpool_offline/zpool_offline_003_pos.ksh
diff --git a/...ool_scrub/zpool_scrub_multiple_copies.ksh → ...ool_scrub/zpool_scrub_multiple_copies.ksh b/...ool_scrub/zpool_scrub_multiple_copies.ksh → ...ool_scrub/zpool_scrub_multiple_copies.ksh
diff --git a/scripts/man-dates.sh b/scripts/man-dates.sh