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 <ryao@gentoo.org>
Signed-off-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2094

diff --git a/include/sys/zio.h b/include/sys/zio.h
index d4350badc10087e845212d6ae5293c457add6089..129e2bcb9b335ca42e533df906a928b7f95da486 100644 (file)
--- 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 a94fecfe87f8d3006aeda80bcfdd5021aaf83f60..a35f5df6560982a716adc46341568ad0a26f8225 100644 (file)
--- 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;