@@ -2122,34 +2122,7 @@ ext2fs_const_inode(const struct ext2_inode_large * large_inode)
return (const struct ext2_inode *) large_inode;
}
-static dgrp_t ext2fs_get_avg_group(ext2_filsys fs)
-{
-#ifdef CONFIG_PFSCK
- dgrp_t average_group;
- unsigned flexbg_size;
-
- if (fs->fs_num_threads <= 1)
- return fs->group_desc_count;
-
- average_group = fs->group_desc_count / fs->fs_num_threads;
- if (average_group <= 1)
- return 1;
-
- if (ext2fs_has_feature_flex_bg(fs->super)) {
- int times = 1;
-
- flexbg_size = 1 << fs->super->s_log_groups_per_flex;
- if (average_group % flexbg_size) {
- times = average_group / flexbg_size;
- average_group = times * flexbg_size;
- }
- }
-
- return average_group;
-#else
- return fs->group_desc_count;
-#endif
-}
+dgrp_t ext2fs_get_avg_group(ext2_filsys fs);
#undef _INLINE_
#endif
@@ -515,6 +515,31 @@ struct read_bitmaps_thread_info {
io_channel rbt_io;
};
+dgrp_t ext2fs_get_avg_group(ext2_filsys fs)
+{
+ dgrp_t average_group;
+ unsigned flexbg_size;
+
+ if (fs->fs_num_threads <= 1)
+ return fs->group_desc_count;
+
+ average_group = fs->group_desc_count / fs->fs_num_threads;
+ if (average_group <= 1)
+ return 1;
+
+ if (ext2fs_has_feature_flex_bg(fs->super)) {
+ int times = 1;
+
+ flexbg_size = 1 << fs->super->s_log_groups_per_flex;
+ if (average_group % flexbg_size) {
+ times = average_group / flexbg_size;
+ average_group = times * flexbg_size;
+ }
+ }
+
+ return average_group;
+}
+
static void* read_bitmaps_thread(void *data)
{
struct read_bitmaps_thread_info *rbt = data;