summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-12-19 11:43:39 +0000
committerdelphij <delphij@FreeBSD.org>2009-12-19 11:43:39 +0000
commit3cc7b7e8fb55b4f130d3395b733137304708d301 (patch)
tree562cbd7b999d9ef6a9f9e7172b4c40b56ae0833b /cddl
parent6d8f8050bf9d7cacd62498b78f7ed2b89002d798 (diff)
downloadFreeBSD-src-3cc7b7e8fb55b4f130d3395b733137304708d301.zip
FreeBSD-src-3cc7b7e8fb55b4f130d3395b733137304708d301.tar.gz
Apply fix Solaris bug 6462803 zfs snapshot -r failed because
filesystem was busy. Submitted by: mm Approved by: pjd MFC after: 2 weeks
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zdb/zdb_il.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c b/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
index 02d35a0..cc08ef5 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
@@ -19,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Print intent log header and statistics.
*/
@@ -345,8 +343,10 @@ dump_intent_log(zilog_t *zilog)
if (zh->zh_log.blk_birth == 0 || verbose < 2)
return;
- (void) printf("\n ZIL header: claim_txg %llu, seq %llu\n",
- (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_replay_seq);
+ (void) printf("\n ZIL header: claim_txg %llu, claim_seq %llu",
+ (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_claim_seq);
+ (void) printf(" replay_seq %llu, flags 0x%llx\n",
+ (u_longlong_t)zh->zh_replay_seq, (u_longlong_t)zh->zh_flags);
if (verbose >= 4)
print_log_bp(&zh->zh_log, "\n\tfirst block: ");
OpenPOWER on IntegriCloud