svn commit: r339138 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Wed Oct  3 14:53:07 2018
New Revision: 339138
URL: https://svnweb.freebsd.org/changeset/base/339138

Log:
  MFC r337207: MFV r337206: 9338 moved dnode has incorrect dn_next_type
  
  illumos/illumos-gate at c7fbe46df966ea665df63b6e6071808987e839d1
  
  Reviewed by: Prashanth Sreenivasa <pks at delphix.com>
  Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro at delphix.com>
  Reviewed by: Dan Kimmel <dan.kimmel at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author:     Matthew Ahrens <mahrens at delphix.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Wed Oct  3 14:52:35 2018	(r339137)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Wed Oct  3 14:53:07 2018	(r339138)
@@ -742,6 +742,8 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
 	ndn->dn_datablkszsec = odn->dn_datablkszsec;
 	ndn->dn_datablksz = odn->dn_datablksz;
 	ndn->dn_maxblkid = odn->dn_maxblkid;
+	bcopy(&odn->dn_next_type[0], &ndn->dn_next_type[0],
+	    sizeof (odn->dn_next_type));
 	bcopy(&odn->dn_next_nblkptr[0], &ndn->dn_next_nblkptr[0],
 	    sizeof (odn->dn_next_nblkptr));
 	bcopy(&odn->dn_next_nlevels[0], &ndn->dn_next_nlevels[0],