Author: mav
Date: Mon Mar 21 00:14:30 2016
New Revision: 297109
URL: https://svnweb.freebsd.org/changeset/base/297109
Log:
MFC r296512: MFV r296511: 6537 Panic on zpool scrub with DEBUG kernel
Reviewed by: Steve Gonczi <gon...@comcast.net>
Reviewed by: Dan McDonald <dan...@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhuk...@gmail.com>
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Approved by: Matthew Ahrens <mahr...@delphix.com>
Author: Gary Mills <gary_mi...@fastmail.fm>
illumos/illumos-gate@8c04a1fa3f7d569d48fe9b5342d0bd4c533179b9
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Mar
21 00:13:39 2016 (r297108)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Mar
21 00:14:30 2016 (r297109)
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright 2016 Gary Mills
*/
#include <sys/dsl_scan.h>
@@ -1554,7 +1555,8 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *
}
if (err != 0)
return;
- if (!scn->scn_async_destroying && zfs_free_leak_on_eio &&
+ if (dp->dp_free_dir != NULL && !scn->scn_async_destroying &&
+ zfs_free_leak_on_eio &&
(dsl_dir_phys(dp->dp_free_dir)->dd_used_bytes != 0 ||
dsl_dir_phys(dp->dp_free_dir)->dd_compressed_bytes != 0 ||
dsl_dir_phys(dp->dp_free_dir)->dd_uncompressed_bytes != 0)) {
@@ -1580,7 +1582,7 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *
-dsl_dir_phys(dp->dp_free_dir)->dd_compressed_bytes,
-dsl_dir_phys(dp->dp_free_dir)->dd_uncompressed_bytes, tx);
}
- if (!scn->scn_async_destroying) {
+ if (dp->dp_free_dir != NULL && !scn->scn_async_destroying) {
/* finished; verify that space accounting went to zero */
ASSERT0(dsl_dir_phys(dp->dp_free_dir)->dd_used_bytes);
ASSERT0(dsl_dir_phys(dp->dp_free_dir)->dd_compressed_bytes);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
