filefrag: fix -B option and extents calculation for FIBMAP
29758d2 broke -B option which is useful for filesystems not supporting
FIEMAP. Also, fix extents calculation for -B which is broken since
2508eaa7.
Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/misc/filefrag.c b/misc/filefrag.c
index 820821b..bb060b6 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -331,9 +331,10 @@
fm_ext.fe_physical = block * st->st_blksize;
fm_ext.fe_length = 0;
(*num_extents)++;
- } else if (verbose && last_block && (block != last_block + 1)) {
- printf("Discontinuity: Block %ld is at %lu (was %lu)\n",
- i, block, last_block + 1);
+ } else if (last_block && (block != last_block + 1)) {
+ if (verbose)
+ printf("Discontinuity: Block %ld is at %lu (was "
+ "%lu)\n", i, block, last_block + 1);
(*num_extents)++;
}
fm_ext.fe_length += st->st_blksize;
@@ -439,7 +440,7 @@
expected = 0;
}
- if (rc < 0) {
+ if (force_bmap || rc < 0) {
expected = filefrag_fibmap(fd, blk_shift, &num_extents,
&st, numblocks, is_ext2);
if (expected < 0) {