summaryrefslogtreecommitdiffstats
path: root/include/sys
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2014-02-05 17:15:35 -0500
committerBrian Behlendorf <[email protected]>2014-02-21 12:10:39 -0800
commited9e8368d3e6ed565174270bd7f5fb7caeac9727 (patch)
tree46e5392ea15504ca1a75394d3a6a127732928b4d /include/sys
parenta16bc6bdd9613c38cc9ceb6041e733b77435d476 (diff)
Revert changes to zbookmark_t
Commit 1421c89142376bfd41e4de22ed7c7846b9e41f95 added a field to zbookmark_t that unintentinoally caused a disk format change. This negatively affected backward compatibility and platform portability. Therefore, this field is being removed. The function that field permitted is left unimplemented until a later patch that will reimplement the field in a way that does not affect the disk format. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Tim Chase <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #2094
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/zio.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sys/zio.h b/include/sys/zio.h
index d4350badc..129e2bcb9 100644
--- a/include/sys/zio.h
+++ b/include/sys/zio.h
@@ -260,7 +260,6 @@ struct zbookmark {
uint64_t zb_object;
int64_t zb_level;
uint64_t zb_blkid;
- char * zb_func;
};
#define SET_BOOKMARK(zb, objset, object, level, blkid) \
@@ -269,7 +268,6 @@ struct zbookmark {
(zb)->zb_object = object; \
(zb)->zb_level = level; \
(zb)->zb_blkid = blkid; \
- (zb)->zb_func = FTAG; \
}
#define ZB_DESTROYED_OBJSET (-1ULL)