A deadlock issue got fixed upstream and merged into master [0]. This patch backports the fix by splitting it into the parts for SPL and ZFS. [0] https://github.com/zfsonlinux/zfs/pull/7939 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>