From 711ccb83d399acbbc3a99eaa0f35ef4ae9026d0e Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Wed, 5 Feb 2014 17:15:35 -0500 Subject: [PATCH] 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 Signed-off-by: Tim Chase Signed-off-by: Brian Behlendorf Issue #2094 --- include/sys/zio.h | 2 -- module/zfs/spa_stats.c | 1 - 2 files changed, 3 deletions(-) diff --git a/include/sys/zio.h b/include/sys/zio.h index d4350badc100..129e2bcb9b33 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) diff --git a/module/zfs/spa_stats.c b/module/zfs/spa_stats.c index a94fecfe87f8..a35f5df65609 100644 --- a/module/zfs/spa_stats.c +++ b/module/zfs/spa_stats.c @@ -207,7 +207,6 @@ spa_read_history_add(spa_t *spa, const zbookmark_t *zb, uint32_t aflags) return; srh = kmem_zalloc(sizeof (spa_read_history_t), KM_PUSHPAGE); - strlcpy(srh->origin, zb->zb_func, sizeof (srh->origin)); strlcpy(srh->comm, getcomm(), sizeof (srh->comm)); srh->start = gethrtime(); srh->objset = zb->zb_objset;