diff options
| author | mm <mm@FreeBSD.org> | 2010-05-13 20:55:58 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-05-13 20:55:58 +0000 |
| commit | cc11636cc42ff8dfd0229ccfea4c2c240e96f360 (patch) | |
| tree | b2e5826e17eda5f7f98901d8cb711f89c39a016a /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c | |
| parent | 3fb4e24eaea20e22c860c0de63f3f98c094cdf92 (diff) | |
| download | FreeBSD-src-cc11636cc42ff8dfd0229ccfea4c2c240e96f360.zip FreeBSD-src-cc11636cc42ff8dfd0229ccfea4c2c240e96f360.tar.gz | |
Fix ZIL-related panic on zfs rollback.
OpenSolaris onnv-revision: 8746:e1d96ca6808c
Approved by: pjd, delphij (mentor)
Obtained from: OpenSolaris (Bug ID 6796377)
MCF after: 1 week
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c index 5e177c5d..15e789f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -226,10 +226,6 @@ traverse_visitbp(struct traverse_data *td, const dnode_phys_t *dnp, return (err); osp = buf->b_data; - /* - * traverse_zil is just here for zdb's leak checking. - * For other consumers, there will be no ZIL blocks. - */ traverse_zil(td, &osp->os_zil_header); for (j = 0; j < osp->os_meta_dnode.dn_nblkptr; j++) { |
