From fc15b816b0e38463328eb5756284a661ffc92899 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 24 Jun 2019 11:41:00 -0700 Subject: [PATCH] scoutfs-utils: update format for rid Signed-off-by: Zach Brown --- utils/src/format.h | 12 ++++++------ utils/src/key.c | 8 ++++---- utils/src/print.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/utils/src/format.h b/utils/src/format.h index 19990161..68396c19 100644 --- a/utils/src/format.h +++ b/utils/src/format.h @@ -114,12 +114,12 @@ struct scoutfs_key { #define skxi_id _sk_third /* node free extent */ -#define sknf_node_id _sk_first +#define sknf_rid _sk_first #define sknf_major _sk_second #define sknf_minor _sk_third /* node orphan inode */ -#define sko_node_id _sk_first +#define sko_rid _sk_first #define sko_ino _sk_second /* inode */ @@ -357,7 +357,7 @@ struct scoutfs_segment_block { */ #define SCOUTFS_INODE_INDEX_ZONE 1 #define SCOUTFS_XATTR_INDEX_ZONE 2 -#define SCOUTFS_NODE_ZONE 3 +#define SCOUTFS_RID_ZONE 3 #define SCOUTFS_FS_ZONE 4 #define SCOUTFS_LOCK_ZONE 5 #define SCOUTFS_MAX_ZONE 8 /* power of 2 is efficient */ @@ -370,9 +370,10 @@ struct scoutfs_segment_block { /* xattr index zone */ #define SCOUTFS_XATTR_INDEX_NAME_TYPE 1 -/* node zone (also used in server alloc btree) */ +/* rid zone (also used in server alloc btree) */ #define SCOUTFS_FREE_EXTENT_BLKNO_TYPE 1 #define SCOUTFS_FREE_EXTENT_BLOCKS_TYPE 2 +#define SCOUTFS_ORPHAN_TYPE 3 /* fs zone */ #define SCOUTFS_INODE_TYPE 1 @@ -382,12 +383,11 @@ struct scoutfs_segment_block { #define SCOUTFS_LINK_BACKREF_TYPE 5 #define SCOUTFS_SYMLINK_TYPE 6 #define SCOUTFS_FILE_EXTENT_TYPE 7 -#define SCOUTFS_ORPHAN_TYPE 8 /* lock zone, only ever found in lock ranges, never in persistent items */ #define SCOUTFS_RENAME_TYPE 1 -#define SCOUTFS_MAX_TYPE 16 /* power of 2 is efficient */ +#define SCOUTFS_MAX_TYPE 8 /* power of 2 is efficient */ /* * File extents have more data than easily fits in the key so we move diff --git a/utils/src/key.c b/utils/src/key.c index 32be964c..4f17201d 100644 --- a/utils/src/key.c +++ b/utils/src/key.c @@ -22,7 +22,7 @@ char *scoutfs_zone_strings[SCOUTFS_MAX_ZONE] = { [SCOUTFS_INODE_INDEX_ZONE] = "ind", [SCOUTFS_XATTR_INDEX_ZONE] = "xnd", - [SCOUTFS_NODE_ZONE] = "nod", + [SCOUTFS_RID_ZONE] = "rid", [SCOUTFS_FS_ZONE] = "fs", }; @@ -30,9 +30,9 @@ char *scoutfs_type_strings[SCOUTFS_MAX_ZONE][SCOUTFS_MAX_TYPE] = { [SCOUTFS_INODE_INDEX_ZONE][SCOUTFS_INODE_INDEX_META_SEQ_TYPE] = "msq", [SCOUTFS_INODE_INDEX_ZONE][SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE] = "dsq", [SCOUTFS_XATTR_INDEX_ZONE][SCOUTFS_XATTR_INDEX_NAME_TYPE] = "nam", - [SCOUTFS_NODE_ZONE][SCOUTFS_FREE_EXTENT_BLKNO_TYPE] = "fbn", - [SCOUTFS_NODE_ZONE][SCOUTFS_FREE_EXTENT_BLOCKS_TYPE] = "fbs", - [SCOUTFS_NODE_ZONE][SCOUTFS_ORPHAN_TYPE] = "orp", + [SCOUTFS_RID_ZONE][SCOUTFS_FREE_EXTENT_BLKNO_TYPE] = "fbn", + [SCOUTFS_RID_ZONE][SCOUTFS_FREE_EXTENT_BLOCKS_TYPE] = "fbs", + [SCOUTFS_RID_ZONE][SCOUTFS_ORPHAN_TYPE] = "orp", [SCOUTFS_FS_ZONE][SCOUTFS_INODE_TYPE] = "ino", [SCOUTFS_FS_ZONE][SCOUTFS_XATTR_TYPE] = "xat", [SCOUTFS_FS_ZONE][SCOUTFS_DIRENT_TYPE] = "dnt", diff --git a/utils/src/print.c b/utils/src/print.c index dd9f7308..b41793c0 100644 --- a/utils/src/print.c +++ b/utils/src/print.c @@ -217,7 +217,7 @@ static print_func_t find_printer(u8 zone, u8 type) type >= SCOUTFS_XATTR_INDEX_NAME_TYPE) return print_xattr_index; - if (zone == SCOUTFS_NODE_ZONE) { + if (zone == SCOUTFS_RID_ZONE) { if (type == SCOUTFS_FREE_EXTENT_BLKNO_TYPE || type == SCOUTFS_FREE_EXTENT_BLOCKS_TYPE) return print_free_extent;