MFV r337020:9443 panic when scrub a v10 pool
illumos/illumos-gate@bb1f424574 Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Andriy Gapon <avg@FreeBSD.org> Reviewed by: Igor Kozhukhov <igor@dilos.org> Approved by: Dan McDonald <danmcd@joyent.com> Author: Matthew Ahrens <mahrens@delphix.com>
This commit is contained in:
commit
a5c4d9335b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=337021
@ -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_tx_t *tx)
|
||||
* 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;
|
||||
|
Loading…
Reference in New Issue
Block a user