debugfs: release clusters only once in release_blocks_proc

While killing file by inode in debugfs (kill_file_by_inode), if
bigalloc feature is turned on, release clusters only once. We do it by
remembering the last released cluster while releasing blocks. We
release a cluster only if it is not already released.

Signed-off-by: Harshad Shirwadkar <harshads@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index bd6949ed8c47684166130047f2f25f99f045029f..905c8cdc6733942a37b2d4e54738571014470b7b 100644 (file)
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -1792,11 +1792,17 @@ static int release_blocks_proc(ext2_filsys fs, blk64_t *blocknr,
                               e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
                               blk64_t ref_block EXT2FS_ATTR((unused)),
                               int ref_offset EXT2FS_ATTR((unused)),
-                              void *private EXT2FS_ATTR((unused)))
+                              void *private)
 {
-       blk64_t block;
+       blk64_t block = *blocknr;
+       blk64_t *last_cluster = (blk64_t *)private;
+       blk64_t cluster = EXT2FS_B2C(fs, block);
+
+       if (cluster == *last_cluster)
+               return 0;
+
+       *last_cluster = cluster;
 
-       block = *blocknr;
        ext2fs_block_alloc_stats2(fs, block, -1);
        return 0;
 }
@@ -1811,8 +1817,9 @@ static void kill_file_by_inode(ext2_ino_t inode)
        if (debugfs_write_inode(inode, &inode_buf, 0))
                return;
        if (ext2fs_inode_has_valid_blocks2(current_fs, &inode_buf)) {
+               blk64_t last_cluster = 0;
                ext2fs_block_iterate3(current_fs, inode, BLOCK_FLAG_READ_ONLY,
-                                     NULL, release_blocks_proc, NULL);
+                                     NULL, release_blocks_proc, &last_cluster);
        }
        printf("\n");
        ext2fs_inode_alloc_stats2(current_fs, inode, -1,