Merge https://github.com/zfsonlinux/zfs/commit/2c33b9127569ad62b4cfe7dd4f651ceeee3d005c
Fix looks reasonable and addresses a possible panic we saw today on a customer
machine.