svn commit: r288597 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Oct  3 11:39:39 2015
New Revision: 288597
URL: https://svnweb.freebsd.org/changeset/base/288597

Log:
  MFC r287744 (by delphij): Reduce diff against upstream.

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Oct  3 11:38:10 2015	(r288596)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sat Oct  3 11:39:39 2015	(r288597)
@@ -1630,6 +1630,7 @@ load_nvlist(spa_t *spa, uint64_t obj, nv
 	error = dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db);
 	if (error != 0)
 		return (error);
+
 	nvsize = *(uint64_t *)db->db_data;
 	dmu_buf_rele(db, FTAG);