diff --git a/utils/src/format.h b/utils/src/format.h index bb8d674a..99241394 100644 --- a/utils/src/format.h +++ b/utils/src/format.h @@ -13,6 +13,8 @@ #define SCOUTFS_BLOCK_SIZE (1 << SCOUTFS_BLOCK_SHIFT) #define SCOUTFS_BLOCK_MASK (SCOUTFS_BLOCK_SIZE - 1) #define SCOUTFS_BLOCKS_PER_PAGE (PAGE_SIZE / SCOUTFS_BLOCK_SIZE) +#define SCOUTFS_BLOCK_SECTOR_SHIFT (SCOUTFS_BLOCK_SHIFT - 9) +#define SCOUTFS_BLOCK_SECTORS (1 << SCOUTFS_BLOCK_SECTOR_SHIFT) /* * FS data is stored in segments, for now they're fixed size. They'll @@ -464,7 +466,6 @@ struct scoutfs_timespec { */ struct scoutfs_inode { __le64 size; - __le64 blocks; __le64 meta_seq; __le64 data_seq; __le64 data_version; diff --git a/utils/src/print.c b/utils/src/print.c index 4c340377..8cca921a 100644 --- a/utils/src/print.c +++ b/utils/src/print.c @@ -79,13 +79,13 @@ static void print_inode(void *key, int key_len, void *val, int val_len) struct scoutfs_inode_key *ikey = key; struct scoutfs_inode *inode = val; - printf(" inode: ino %llu size %llu blocks %llu nlink %u\n" + printf(" inode: ino %llu size %llu nlink %u\n" " uid %u gid %u mode 0%o rdev 0x%x flags 0x%x\n" " next_readdir_pos %llu meta_seq %llu data_seq %llu data_version %llu\n" " atime %llu.%08u ctime %llu.%08u\n" " mtime %llu.%08u\n", be64_to_cpu(ikey->ino), - le64_to_cpu(inode->size), le64_to_cpu(inode->blocks), + le64_to_cpu(inode->size), le32_to_cpu(inode->nlink), le32_to_cpu(inode->uid), le32_to_cpu(inode->gid), le32_to_cpu(inode->mode), le32_to_cpu(inode->rdev),