diff --git a/utils/src/format.h b/utils/src/format.h index 1e004fbe..cd33a7c6 100644 --- a/utils/src/format.h +++ b/utils/src/format.h @@ -121,11 +121,6 @@ struct scoutfs_key { #define skii_major _sk_second #define skii_ino _sk_third -/* xattr index */ -#define skxi_hash _sk_first -#define skxi_ino _sk_second -#define skxi_id _sk_third - /* node orphan inode */ #define sko_rid _sk_first #define sko_ino _sk_second @@ -430,10 +425,9 @@ struct scoutfs_bloom_block { * Keys are first sorted by major key zones. */ #define SCOUTFS_INODE_INDEX_ZONE 1 -#define SCOUTFS_XATTR_INDEX_ZONE 2 -#define SCOUTFS_RID_ZONE 3 -#define SCOUTFS_FS_ZONE 4 -#define SCOUTFS_LOCK_ZONE 5 +#define SCOUTFS_RID_ZONE 2 +#define SCOUTFS_FS_ZONE 3 +#define SCOUTFS_LOCK_ZONE 4 /* Items only stored in server btrees */ #define SCOUTFS_LOG_TREES_ZONE 6 #define SCOUTFS_LOCK_CLIENTS_ZONE 7 @@ -446,9 +440,6 @@ struct scoutfs_bloom_block { #define SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE 2 #define SCOUTFS_INODE_INDEX_NR 3 /* don't forget to update */ -/* xattr index zone */ -#define SCOUTFS_XATTR_INDEX_NAME_TYPE 1 - /* rid zone (also used in server alloc btree) */ #define SCOUTFS_ORPHAN_TYPE 1 diff --git a/utils/src/print.c b/utils/src/print.c index 74d03c34..82784f82 100644 --- a/utils/src/print.c +++ b/utils/src/print.c @@ -221,13 +221,6 @@ static void print_inode_index(struct scoutfs_key *key, void *val, int val_len) le64_to_cpu(key->skii_major), le64_to_cpu(key->skii_ino)); } -static void print_xattr_index(struct scoutfs_key *key, void *val, int val_len) -{ - printf(" xattr index: hash 0x%016llx ino %llu id %llu\n", - le64_to_cpu(key->skxi_hash), le64_to_cpu(key->skxi_ino), - le64_to_cpu(key->skxi_id)); -} - typedef void (*print_func_t)(struct scoutfs_key *key, void *val, int val_len); static print_func_t find_printer(u8 zone, u8 type) @@ -237,10 +230,6 @@ static print_func_t find_printer(u8 zone, u8 type) type <= SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE) return print_inode_index; - if (zone == SCOUTFS_XATTR_INDEX_ZONE && - type >= SCOUTFS_XATTR_INDEX_NAME_TYPE) - return print_xattr_index; - if (zone == SCOUTFS_RID_ZONE) { if (type == SCOUTFS_ORPHAN_TYPE) return print_orphan;