K 10
svn:author
V 2
mm
K 8
svn:date
V 27
2010-10-11T09:34:46.077885Z
K 7
svn:log
V 350
MFC r210470:

Import two changesets from OpenSolaris to make future updates easier.

The changes do not affect FreeBSD code because
zfs_znode_move(), cleanlocks() and cleanshares() are not used.

OpenSolaris onnv changeset:	9788:f660bc44f2e8, 9909:aa280f585a3e

Approved by:	pjd, delphij (mentor)
Obtained from:	OpenSolaris (Bug ID 6843700, 6790232)

END