diff --git a/ZFSin/zfs/include/sys/fs/zfs.h b/ZFSin/zfs/include/sys/fs/zfs.h index c0821778..edbd3f41 100644 --- 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 index e28aaac3..30ddb12e 100644 --- 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/tests/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_003_pos.ksh b/ZFSin/zfs/tests/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_003_pos.ksh similarity index 100% rename from tests/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_003_pos.ksh rename to ZFSin/zfs/tests/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_003_pos.ksh diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_multiple_copies.ksh b/ZFSin/zfs/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_multiple_copies.ksh similarity index 100% rename from tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_multiple_copies.ksh rename to ZFSin/zfs/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_multiple_copies.ksh diff --git a/scripts/man-dates.sh b/scripts/man-dates.sh deleted file mode 100755 index 186d9463..00000000 --- a/scripts/man-dates.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# This script updates the date lines in the man pages to the date of the last -# commit to that file. - -set -eu - -find man -type f | while read -r i ; do - git_date=$(git log -1 --date=short --format="%ad" -- "$i") - [ "x$git_date" = "x" ] && continue - sed -i "s|^\.Dd.*|.Dd $(date -d "$git_date" "+%B %-d, %Y")|" "$i" -done