From 1fee9fcf2106c8aca117d973f8e0b650820756d0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 24 Nov 2009 19:46:59 +0000 Subject: [PATCH] Replaced some off_t's in on-disk structure definitions by fixed-size int64. I couldn't bring myself to replace the types everywhere they are used, though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34215 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/bfs/BPlusTree.h | 12 ++++++------ src/add-ons/kernel/file_systems/bfs/bfs.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.h b/src/add-ons/kernel/file_systems/bfs/BPlusTree.h index e3c36d8130..ce185d33ab 100644 --- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.h +++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.h @@ -22,9 +22,9 @@ struct bplustree_header { uint32 node_size; uint32 max_number_of_levels; uint32 data_type; - off_t root_node_pointer; - off_t free_node_pointer; - off_t maximum_size; + int64 root_node_pointer; + int64 free_node_pointer; + int64 maximum_size; uint32 Magic() const { return BFS_ENDIAN_TO_HOST_INT32(magic); } uint32 NodeSize() const { return BFS_ENDIAN_TO_HOST_INT32(node_size); } @@ -60,9 +60,9 @@ struct sorted_array; typedef sorted_array duplicate_array; struct bplustree_node { - off_t left_link; - off_t right_link; - off_t overflow_link; + int64 left_link; + int64 right_link; + int64 overflow_link; uint16 all_key_count; uint16 all_key_length; diff --git a/src/add-ons/kernel/file_systems/bfs/bfs.h b/src/add-ons/kernel/file_systems/bfs/bfs.h index 7148bb77fb..936ce6f3a2 100644 --- a/src/add-ons/kernel/file_systems/bfs/bfs.h +++ b/src/add-ons/kernel/file_systems/bfs/bfs.h @@ -61,8 +61,8 @@ struct disk_super_block { int32 fs_byte_order; uint32 block_size; uint32 block_shift; - off_t num_blocks; - off_t used_blocks; + int64 num_blocks; + int64 used_blocks; int32 inode_size; int32 magic2; int32 blocks_per_ag; @@ -70,8 +70,8 @@ struct disk_super_block { int32 num_ags; int32 flags; block_run log_blocks; - off_t log_start; - off_t log_end; + int64 log_start; + int64 log_end; int32 magic3; inode_addr root_dir; inode_addr indices; @@ -117,12 +117,12 @@ struct disk_super_block { struct data_stream { block_run direct[NUM_DIRECT_BLOCKS]; - off_t max_direct_range; + int64 max_direct_range; block_run indirect; - off_t max_indirect_range; + int64 max_indirect_range; block_run double_indirect; - off_t max_double_indirect_range; - off_t size; + int64 max_double_indirect_range; + int64 size; off_t MaxDirectRange() const { return BFS_ENDIAN_TO_HOST_INT64(max_direct_range); }