svn commit: r287744 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Sun Sep 13 06:49:42 2015
New Revision: 287744
URL: https://svnweb.freebsd.org/changeset/base/287744

Log:
  Note r286552 as merged and reduce diff against upstream.

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Sep 13 06:40:32 2015	(r287743)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Sep 13 06:49:42 2015	(r287744)
@@ -1633,6 +1633,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);