diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-06-23 23:00:50 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-06-23 23:00:50 -0400 |
| commit | ac3256fd31d47ec75fababa7c1cd5d679750ed6f (patch) | |
| tree | 607fd6456fa465326f10a89563ab303e8638d343 /lib/ext2fs/ext2fs.h | |
| parent | 60afa1d81664f8f7f39d5e4cf70b397e8d7154a7 (diff) | |
| download | e2fsprogs-ac3256fd31d47ec75fababa7c1cd5d679750ed6f.tar.gz | |
Fix gcc and clang warnings
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'lib/ext2fs/ext2fs.h')
| -rw-r--r-- | lib/ext2fs/ext2fs.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index eb6c0926..3d4afac4 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -1738,6 +1738,7 @@ extern blk_t ext2fs_group_first_block(ext2_filsys fs, dgrp_t group); extern blk_t ext2fs_group_last_block(ext2_filsys fs, dgrp_t group); extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs, struct ext2_inode *inode); +extern int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks); extern unsigned int ext2fs_div_ceil(unsigned int a, unsigned int b); extern __u64 ext2fs_div64_ceil(__u64 a, __u64 b); extern int ext2fs_dirent_name_len(const struct ext2_dir_entry *entry); @@ -1969,18 +1970,6 @@ _INLINE_ blk_t ext2fs_inode_data_blocks(ext2_filsys fs, return (blk_t) ext2fs_inode_data_blocks2(fs, inode); } -/* htree levels for ext4 */ -#define EXT4_HTREE_LEVEL_COMPAT 2 -#define EXT4_HTREE_LEVEL 3 - -static inline unsigned int ext2_dir_htree_level(ext2_filsys fs) -{ - if (ext2fs_has_feature_largedir(fs->super)) - return EXT4_HTREE_LEVEL; - - return EXT4_HTREE_LEVEL_COMPAT; -} - _INLINE_ int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks) { return blocks * ((fs->blocksize - 8) / sizeof(struct ext2_dx_entry)); @@ -2039,6 +2028,18 @@ ext2fs_const_inode(const struct ext2_inode_large * large_inode) #undef _INLINE_ #endif +/* htree levels for ext4 */ +#define EXT4_HTREE_LEVEL_COMPAT 2 +#define EXT4_HTREE_LEVEL 3 + +static inline unsigned int ext2_dir_htree_level(ext2_filsys fs) +{ + if (ext2fs_has_feature_largedir(fs->super)) + return EXT4_HTREE_LEVEL; + + return EXT4_HTREE_LEVEL_COMPAT; +} + #ifdef __cplusplus } #endif |