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

[Alexander Motin]

Author: mav
Date: Wed Oct  3 02:19:17 2018
New Revision: 339113
URL: https://svnweb.freebsd.org/changeset/base/339113

Log:
  MFC r337021: MFV r337020:9443 panic when scrub a v10 pool
  
  illumos/illumos-gate at bb1f424574ac8e08069d0ba993c2a41ffe796794
  
  Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Andriy Gapon <avg at FreeBSD.org>
  Reviewed by: Igor Kozhukhov <igor at dilos.org>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author:     Matthew Ahrens <mahrens at delphix.com>

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

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Wed Oct  3 02:18:16 2018	(r339112)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Wed Oct  3 02:19:17 2018	(r339113)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2018 by Delphix. All rights reserved.
  * Copyright 2016 Gary Mills
  * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright 2017 Joyent, Inc.
@@ -2164,7 +2164,8 @@ dsl_scan_visitds(dsl_scan_t *scn, uint64_t dsobj, dmu_
 	 * block-sharing rules don't apply to it.
 	 */
 	if (DSL_SCAN_IS_SCRUB_RESILVER(scn) && !dsl_dataset_is_snapshot(ds) &&
-	    ds->ds_dir != dp->dp_origin_snap->ds_dir) {
+	    (dp->dp_origin_snap == NULL ||
+	    ds->ds_dir != dp->dp_origin_snap->ds_dir)) {
 		objset_t *os;
 		if (dmu_objset_from_ds(ds, &os) != 0) {
 			goto out;