Index: uspace/lib/ext2/libext2_block_group.c =================================================================== --- uspace/lib/ext2/libext2_block_group.c (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_block_group.c (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -43,5 +43,5 @@ * @param bg pointer to block group descriptor */ -inline uint32_t ext2_block_group_get_block_bitmap_block(ext2_block_group_t *bg) +uint32_t ext2_block_group_get_block_bitmap_block(ext2_block_group_t *bg) { return uint32_t_le2host(bg->block_bitmap_block); @@ -53,5 +53,5 @@ * @param bg pointer to block group descriptor */ -inline uint32_t ext2_block_group_get_inode_bitmap_block(ext2_block_group_t *bg) +uint32_t ext2_block_group_get_inode_bitmap_block(ext2_block_group_t *bg) { return uint32_t_le2host(bg->inode_bitmap_block); @@ -63,5 +63,5 @@ * @param bg pointer to block group descriptor */ -inline uint32_t ext2_block_group_get_inode_table_first_block(ext2_block_group_t *bg) +uint32_t ext2_block_group_get_inode_table_first_block(ext2_block_group_t *bg) { return uint32_t_le2host(bg->inode_table_first_block); @@ -73,5 +73,5 @@ * @param bg pointer to block group descriptor */ -inline uint16_t ext2_block_group_get_free_block_count(ext2_block_group_t *bg) +uint16_t ext2_block_group_get_free_block_count(ext2_block_group_t *bg) { return uint16_t_le2host(bg->free_block_count); @@ -84,5 +84,5 @@ * @param val new value */ -inline void ext2_block_group_set_free_block_count(ext2_block_group_t *bg, +void ext2_block_group_set_free_block_count(ext2_block_group_t *bg, uint16_t val) { @@ -95,5 +95,5 @@ * @param bg pointer to block group descriptor */ -inline uint16_t ext2_block_group_get_free_inode_count(ext2_block_group_t *bg) +uint16_t ext2_block_group_get_free_inode_count(ext2_block_group_t *bg) { return uint16_t_le2host(bg->free_inode_count); @@ -105,5 +105,5 @@ * @param bg pointer to block group descriptor */ -inline uint16_t ext2_block_group_get_directory_inode_count(ext2_block_group_t *bg) +uint16_t ext2_block_group_get_directory_inode_count(ext2_block_group_t *bg) { return uint16_t_le2host(bg->directory_inode_count); Index: uspace/lib/ext2/libext2_block_group.h =================================================================== --- uspace/lib/ext2/libext2_block_group.h (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_block_group.h (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -55,12 +55,12 @@ #define EXT2_BLOCK_GROUP_DESCRIPTOR_SIZE 32 -inline uint32_t ext2_block_group_get_block_bitmap_block(ext2_block_group_t *); -inline uint32_t ext2_block_group_get_inode_bitmap_block(ext2_block_group_t *); -inline uint32_t ext2_block_group_get_inode_table_first_block(ext2_block_group_t *); -inline uint16_t ext2_block_group_get_free_block_count(ext2_block_group_t *); -inline uint16_t ext2_block_group_get_free_inode_count(ext2_block_group_t *); -inline uint16_t ext2_block_group_get_directory_inode_count(ext2_block_group_t *); +extern uint32_t ext2_block_group_get_block_bitmap_block(ext2_block_group_t *); +extern uint32_t ext2_block_group_get_inode_bitmap_block(ext2_block_group_t *); +extern uint32_t ext2_block_group_get_inode_table_first_block(ext2_block_group_t *); +extern uint16_t ext2_block_group_get_free_block_count(ext2_block_group_t *); +extern uint16_t ext2_block_group_get_free_inode_count(ext2_block_group_t *); +extern uint16_t ext2_block_group_get_directory_inode_count(ext2_block_group_t *); -inline void ext2_block_group_set_free_block_count(ext2_block_group_t *, uint16_t); +extern void ext2_block_group_set_free_block_count(ext2_block_group_t *, uint16_t); #endif Index: uspace/lib/ext2/libext2_directory.c =================================================================== --- uspace/lib/ext2/libext2_directory.c (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_directory.c (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -45,5 +45,5 @@ * @param de pointer to linked list directory entry */ -inline uint32_t ext2_directory_entry_ll_get_inode(ext2_directory_entry_ll_t *de) +uint32_t ext2_directory_entry_ll_get_inode(ext2_directory_entry_ll_t *de) { return uint32_t_le2host(de->inode); @@ -55,5 +55,5 @@ * @param de pointer to linked list directory entry */ -inline uint16_t ext2_directory_entry_ll_get_entry_length( +uint16_t ext2_directory_entry_ll_get_entry_length( ext2_directory_entry_ll_t *de) { @@ -66,5 +66,5 @@ * @param de pointer to linked list directory entry */ -inline uint16_t ext2_directory_entry_ll_get_name_length( +uint16_t ext2_directory_entry_ll_get_name_length( ext2_superblock_t *sb, ext2_directory_entry_ll_t *de) { Index: uspace/lib/ext2/libext2_directory.h =================================================================== --- uspace/lib/ext2/libext2_directory.h (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_directory.h (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -64,8 +64,8 @@ -inline uint32_t ext2_directory_entry_ll_get_inode(ext2_directory_entry_ll_t *); -inline uint16_t ext2_directory_entry_ll_get_entry_length( +extern uint32_t ext2_directory_entry_ll_get_inode(ext2_directory_entry_ll_t *); +extern uint16_t ext2_directory_entry_ll_get_entry_length( ext2_directory_entry_ll_t *); -inline uint16_t ext2_directory_entry_ll_get_name_length( +extern uint16_t ext2_directory_entry_ll_get_name_length( ext2_superblock_t *, ext2_directory_entry_ll_t *); Index: uspace/lib/ext2/libext2_inode.c =================================================================== --- uspace/lib/ext2/libext2_inode.c (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_inode.c (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -45,5 +45,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_mode(ext2_superblock_t *sb, ext2_inode_t *inode) +uint32_t ext2_inode_get_mode(ext2_superblock_t *sb, ext2_inode_t *inode) { if (ext2_superblock_get_os(sb) == EXT2_SUPERBLOCK_OS_HURD) { @@ -61,5 +61,5 @@ * @param type EXT2_INODE_MODE_TYPE_* constant to check */ -inline bool ext2_inode_is_type(ext2_superblock_t *sb, ext2_inode_t *inode, uint32_t type) +bool ext2_inode_is_type(ext2_superblock_t *sb, ext2_inode_t *inode, uint32_t type) { uint32_t mode = ext2_inode_get_mode(sb, inode); @@ -72,5 +72,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_user_id(ext2_superblock_t *sb, ext2_inode_t *inode) +uint32_t ext2_inode_get_user_id(ext2_superblock_t *sb, ext2_inode_t *inode) { uint32_t os = ext2_superblock_get_os(sb); @@ -90,5 +90,5 @@ * @param inode pointer to inode */ -inline uint64_t ext2_inode_get_size(ext2_superblock_t *sb, ext2_inode_t *inode) +uint64_t ext2_inode_get_size(ext2_superblock_t *sb, ext2_inode_t *inode) { uint32_t major_rev = ext2_superblock_get_rev_major(sb); @@ -109,5 +109,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_group_id(ext2_superblock_t *sb, ext2_inode_t *inode) +uint32_t ext2_inode_get_group_id(ext2_superblock_t *sb, ext2_inode_t *inode) { uint32_t os = ext2_superblock_get_os(sb); @@ -125,5 +125,5 @@ * @param inode pointer to inode */ -inline uint16_t ext2_inode_get_usage_count(ext2_inode_t *inode) +uint16_t ext2_inode_get_usage_count(ext2_inode_t *inode) { return uint16_t_le2host(inode->usage_count); @@ -137,5 +137,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *inode) +uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *inode) { return uint32_t_le2host(inode->reserved_512_blocks); @@ -148,5 +148,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *sb, +uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *sb, ext2_inode_t *inode) { @@ -160,5 +160,5 @@ * @param inode pointer to inode */ -inline uint32_t ext2_inode_get_flags(ext2_inode_t *inode) { +uint32_t ext2_inode_get_flags(ext2_inode_t *inode) { return uint32_t_le2host(inode->flags); } @@ -170,5 +170,5 @@ * @param idx Index to block. Valid values are 0 <= idx < 12 */ -inline uint32_t ext2_inode_get_direct_block(ext2_inode_t *inode, uint8_t idx) +uint32_t ext2_inode_get_direct_block(ext2_inode_t *inode, uint8_t idx) { assert(idx < EXT2_INODE_DIRECT_BLOCKS); @@ -183,5 +183,5 @@ * singly-indirect block and 2 is triply-indirect-block */ -inline uint32_t ext2_inode_get_indirect_block(ext2_inode_t *inode, uint8_t idx) +uint32_t ext2_inode_get_indirect_block(ext2_inode_t *inode, uint8_t idx) { assert(idx < 3); Index: uspace/lib/ext2/libext2_inode.h =================================================================== --- uspace/lib/ext2/libext2_inode.h (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_inode.h (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -83,16 +83,16 @@ } ext2_inode_ref_t; -inline uint32_t ext2_inode_get_mode(ext2_superblock_t *, ext2_inode_t *); -inline bool ext2_inode_is_type(ext2_superblock_t *, ext2_inode_t *, uint32_t); -inline uint32_t ext2_inode_get_user_id(ext2_superblock_t *, ext2_inode_t *); -inline uint64_t ext2_inode_get_size(ext2_superblock_t *, ext2_inode_t *); -inline uint32_t ext2_inode_get_group_id(ext2_superblock_t *, ext2_inode_t *); -inline uint16_t ext2_inode_get_usage_count(ext2_inode_t *); -inline uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *); -inline uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *, +extern uint32_t ext2_inode_get_mode(ext2_superblock_t *, ext2_inode_t *); +extern bool ext2_inode_is_type(ext2_superblock_t *, ext2_inode_t *, uint32_t); +extern uint32_t ext2_inode_get_user_id(ext2_superblock_t *, ext2_inode_t *); +extern uint64_t ext2_inode_get_size(ext2_superblock_t *, ext2_inode_t *); +extern uint32_t ext2_inode_get_group_id(ext2_superblock_t *, ext2_inode_t *); +extern uint16_t ext2_inode_get_usage_count(ext2_inode_t *); +extern uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *); +extern uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *, ext2_inode_t *); -inline uint32_t ext2_inode_get_flags(ext2_inode_t *); -inline uint32_t ext2_inode_get_direct_block(ext2_inode_t *, uint8_t); -inline uint32_t ext2_inode_get_indirect_block(ext2_inode_t *, uint8_t level); +extern uint32_t ext2_inode_get_flags(ext2_inode_t *); +extern uint32_t ext2_inode_get_direct_block(ext2_inode_t *, uint8_t); +extern uint32_t ext2_inode_get_indirect_block(ext2_inode_t *, uint8_t level); Index: uspace/lib/ext2/libext2_superblock.c =================================================================== --- uspace/lib/ext2/libext2_superblock.c (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_superblock.c (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -46,5 +46,5 @@ * @param sb pointer to superblock */ -inline uint16_t ext2_superblock_get_magic(ext2_superblock_t *sb) +uint16_t ext2_superblock_get_magic(ext2_superblock_t *sb) { return uint16_t_le2host(sb->magic); @@ -57,5 +57,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_first_block(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_first_block(ext2_superblock_t *sb) { return uint32_t_le2host(sb->first_block); @@ -68,5 +68,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_block_size_log2(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_block_size_log2(ext2_superblock_t *sb) { return uint32_t_le2host(sb->block_size_log2); @@ -78,5 +78,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_block_size(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_block_size(ext2_superblock_t *sb) { return 1024 << ext2_superblock_get_block_size_log2(sb); @@ -90,5 +90,5 @@ * @param sb pointer to superblock */ -inline int32_t ext2_superblock_get_fragment_size_log2(ext2_superblock_t *sb) +int32_t ext2_superblock_get_fragment_size_log2(ext2_superblock_t *sb) { return uint32_t_le2host(sb->fragment_size_log2); @@ -100,5 +100,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_fragment_size(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_fragment_size(ext2_superblock_t *sb) { int32_t log = ext2_superblock_get_fragment_size_log2(sb); @@ -116,5 +116,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_blocks_per_group(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_blocks_per_group(ext2_superblock_t *sb) { return uint32_t_le2host(sb->blocks_per_group); @@ -126,5 +126,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_fragments_per_group(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_fragments_per_group(ext2_superblock_t *sb) { return uint32_t_le2host(sb->fragments_per_group); @@ -136,5 +136,5 @@ * @param sb pointer to superblock */ -inline uint16_t ext2_superblock_get_state(ext2_superblock_t *sb) +uint16_t ext2_superblock_get_state(ext2_superblock_t *sb) { return uint16_t_le2host(sb->state); @@ -146,5 +146,5 @@ * @param sb pointer to superblock */ -inline uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *sb) +uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *sb) { return uint16_t_le2host(sb->rev_minor); @@ -156,5 +156,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *sb) { return uint32_t_le2host(sb->rev_major); @@ -166,5 +166,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *sb) { if (ext2_superblock_get_rev_major(sb) == 0) { @@ -179,5 +179,5 @@ * @param sb pointer to superblock */ -inline uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *sb) +uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *sb) { if (ext2_superblock_get_rev_major(sb) == 0) { @@ -192,5 +192,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *sb) { return uint32_t_le2host(sb->total_inode_count); @@ -202,5 +202,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *sb) { return uint32_t_le2host(sb->total_block_count); @@ -212,5 +212,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *sb) { return uint32_t_le2host(sb->reserved_block_count); @@ -222,5 +222,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *sb) { return uint32_t_le2host(sb->free_block_count); @@ -232,5 +232,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *sb) { return uint32_t_le2host(sb->free_inode_count); @@ -242,5 +242,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_os(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_os(ext2_superblock_t *sb) { return uint32_t_le2host(sb->os); @@ -252,5 +252,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_inodes_per_group(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_inodes_per_group(ext2_superblock_t *sb) { return uint32_t_le2host(sb->inodes_per_group); @@ -262,5 +262,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_features_compatible(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_features_compatible(ext2_superblock_t *sb) { return uint32_t_le2host(sb->features_compatible); @@ -272,5 +272,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_features_incompatible(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_features_incompatible(ext2_superblock_t *sb) { return uint32_t_le2host(sb->features_incompatible); @@ -282,5 +282,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *sb) { return uint32_t_le2host(sb->features_read_only); @@ -305,5 +305,5 @@ * @param sb pointer to superblock */ -inline uint32_t ext2_superblock_get_block_group_count(ext2_superblock_t *sb) +uint32_t ext2_superblock_get_block_group_count(ext2_superblock_t *sb) { /* We add one to the result because e.g. 2/3 = 0, while to store Index: uspace/lib/ext2/libext2_superblock.h =================================================================== --- uspace/lib/ext2/libext2_superblock.h (revision cf5e86e549aa562979bea4debb3f5231e65b77c5) +++ uspace/lib/ext2/libext2_superblock.h (revision 18626b313017dbffad370b7856191b8c62bae88e) @@ -85,28 +85,28 @@ -inline uint16_t ext2_superblock_get_magic(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_first_block(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_block_size_log2(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_block_size(ext2_superblock_t *); -inline int32_t ext2_superblock_get_fragment_size_log2(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_fragment_size(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_blocks_per_group(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_fragments_per_group(ext2_superblock_t *); -inline uint16_t ext2_superblock_get_state(ext2_superblock_t *); -inline uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_os(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *); -inline uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_block_group_count(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_inodes_per_group(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_features_compatible(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_features_incompatible(ext2_superblock_t *); -inline uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *); +extern uint16_t ext2_superblock_get_magic(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_first_block(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_block_size_log2(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_block_size(ext2_superblock_t *); +extern int32_t ext2_superblock_get_fragment_size_log2(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_fragment_size(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_blocks_per_group(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_fragments_per_group(ext2_superblock_t *); +extern uint16_t ext2_superblock_get_state(ext2_superblock_t *); +extern uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_os(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *); +extern uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_block_group_count(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_inodes_per_group(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_features_compatible(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_features_incompatible(ext2_superblock_t *); +extern uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *); extern int ext2_superblock_read_direct(devmap_handle_t, ext2_superblock_t **);