MFS10 r272883
MFC r272474
Fix ZFS ZVOL deadlock and rename issues

Approved by:	re@ (delphij)
Sponsored by:	Multiplay