diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-08-23 19:32:57 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-08-23 19:32:57 +0000 |
| commit | 671303c6d59578e15cb0246bede35d15bb13af00 (patch) | |
| tree | 882f66554bf9020c93c7b164e6b1024effb50186 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h | |
| parent | 3ed7dc5f4635dde26433e4d1c1e44ec85f68b747 (diff) | |
| parent | b15aa3a4ae71c04bf81bbceccecde17f08054e5b (diff) | |
| download | src-671303c6d59578e15cb0246bede35d15bb13af00.tar.gz src-671303c6d59578e15cb0246bede35d15bb13af00.zip | |
Merge recent vendor changes:
3086 unnecessarily setting DS_FLAG_INCONSISTENT on async destroyed datasets
3090 vdev_reopen() during reguid causes vdev to be treated as corrupt
3102 vdev_uberblock_load() and vdev_validate() may read the wrong label
Referenes:
https://www.illumos.org/issues/3086
https://www.illumos.org/issues/3090
https://www.illumos.org/issues/3102
PR: kern/170912, kern/170914
Obtained from: illumos (changeset #13776, #13777)
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=239620
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h index 1d4c0cc6c1de..58566203b697 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ @@ -130,6 +131,7 @@ struct zilog { zil_header_t zl_old_header; /* debugging aid */ uint_t zl_prev_blks[ZIL_PREV_BLKS]; /* size - sector rounded */ uint_t zl_prev_rotor; /* rotor for zl_prev[] */ + txg_node_t zl_dirty_link; /* protected by dp_dirty_zilogs list */ }; typedef struct zil_bp_node { |