diff options
| -rw-r--r-- | misc/e2freefrag.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c index 268fac96..20b79b3a 100644 --- a/misc/e2freefrag.c +++ b/misc/e2freefrag.c @@ -163,7 +163,8 @@ static void scan_block_bitmap(ext2_filsys fs, struct chunk_info *info) #if defined(HAVE_EXT2_IOCTLS) && !defined(DEBUGFS) # define FSMAP_EXTENTS 1024 -static int scan_online(ext2_filsys fs, struct chunk_info *info) +static int scan_online(ext2_filsys fs, struct chunk_info *info, + blk64_t *free_blks) { struct fsmap_head *fsmap; struct fsmap *extent; @@ -204,6 +205,7 @@ static int scan_online(ext2_filsys fs, struct chunk_info *info) fsmap->fmh_keys[1].fmr_offset = ULLONG_MAX; fsmap->fmh_keys[1].fmr_flags = UINT_MAX; + *free_blks = 0; /* Fill the extent histogram with live data */ while (1) { ret = ioctl(fd, FS_IOC_GETFSMAP, fsmap); @@ -225,6 +227,7 @@ static int scan_online(ext2_filsys fs, struct chunk_info *info) continue; update_chunk_stats(info, extent->fmr_length / fs->blocksize); + *free_blks += (extent->fmr_length / fs->blocksize); } p = &fsmap->fmh_recs[fsmap->fmh_entries - 1]; @@ -236,13 +239,15 @@ static int scan_online(ext2_filsys fs, struct chunk_info *info) return 1; } #else -# define scan_online(fs, info) (0) +# define scan_online(fs, info, free_blks) (0) #endif /* HAVE_EXT2_IOCTLS */ -static errcode_t scan_offline(ext2_filsys fs, struct chunk_info *info) +static errcode_t scan_offline(ext2_filsys fs, struct chunk_info *info, + blk64_t *free_blks) { errcode_t retval; + *free_blks = ext2fs_free_blocks_count(fs->super); retval = ext2fs_read_block_bitmap(fs); if (retval) return retval; @@ -251,7 +256,7 @@ static errcode_t scan_offline(ext2_filsys fs, struct chunk_info *info) } static errcode_t dump_chunk_info(ext2_filsys fs, struct chunk_info *info, - FILE *f) + FILE *f, blk64_t free_blks) { unsigned long total_chunks; const char *unitp = "KMGTPEZY"; @@ -261,8 +266,8 @@ static errcode_t dump_chunk_info(ext2_filsys fs, struct chunk_info *info, fprintf(f, "Total blocks: %llu\nFree blocks: %llu (%0.1f%%)\n", ext2fs_blocks_count(fs->super), - ext2fs_free_blocks_count(fs->super), - (double)ext2fs_free_blocks_count(fs->super) * 100 / + free_blks, + (double)free_blks * 100 / ext2fs_blocks_count(fs->super)); if (info->chunkbytes) { @@ -306,7 +311,7 @@ static errcode_t dump_chunk_info(ext2_filsys fs, struct chunk_info *info, info->histogram.fc_chunks[i], info->histogram.fc_blocks[i], (double)info->histogram.fc_blocks[i] * 100 / - ext2fs_free_blocks_count(fs->super)); + free_blks); } start = end; if (start == 1<<10) { @@ -330,14 +335,15 @@ static void close_device(char *device_name, ext2_filsys fs) static void collect_info(ext2_filsys fs, struct chunk_info *chunk_info, FILE *f) { unsigned int retval = 0; + blk64_t free_blks = 0; fprintf(f, "Device: %s\n", fs->device_name); fprintf(f, "Blocksize: %u bytes\n", fs->blocksize); init_chunk_info(fs, chunk_info); - if (!scan_online(fs, chunk_info)) { + if (!scan_online(fs, chunk_info, &free_blks)) { init_chunk_info(fs, chunk_info); - retval = scan_offline(fs, chunk_info); + retval = scan_offline(fs, chunk_info, &free_blks); } if (retval) { com_err(fs->device_name, retval, "while reading block bitmap"); @@ -345,7 +351,7 @@ static void collect_info(ext2_filsys fs, struct chunk_info *chunk_info, FILE *f) exit(1); } - retval = dump_chunk_info(fs, chunk_info, f); + retval = dump_chunk_info(fs, chunk_info, f, free_blks); if (retval) { com_err(fs->device_name, retval, "while dumping chunk info"); close_device(fs->device_name, fs); |