Implement the ability for the test_io mechanism to abort after n reads

[tools/e2fsprogs.git] / lib / ext2fs / freefs.c

diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c
index 485f921..78c64bf 100644 (file)
--- a/lib/ext2fs/freefs.c
+++ b/lib/ext2fs/freefs.c
@@ -14,12 +14,7 @@
 #include <unistd.h>
 #endif
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fsP.h"
 
 static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache);
@@ -32,13 +27,13 @@ void ext2fs_free(ext2_filsys fs)
                io_channel_close(fs->io);
        }
        if (fs->device_name)
-               ext2fs_free_mem((void **) &fs->device_name);
+               ext2fs_free_mem(&fs->device_name);
        if (fs->super)
-               ext2fs_free_mem((void **) &fs->super);
+               ext2fs_free_mem(&fs->super);
        if (fs->orig_super)
-               ext2fs_free_mem((void **) &fs->orig_super);
+               ext2fs_free_mem(&fs->orig_super);
        if (fs->group_desc)
-               ext2fs_free_mem((void **) &fs->group_desc);
+               ext2fs_free_mem(&fs->group_desc);
        if (fs->block_map)
                ext2fs_free_block_bitmap(fs->block_map);
        if (fs->inode_map)
@@ -56,7 +51,7 @@ void ext2fs_free(ext2_filsys fs)
        
        fs->magic = 0;
 
-       ext2fs_free_mem((void **) &fs);
+       ext2fs_free_mem(&fs);
 }
 
 void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
@@ -66,14 +61,14 @@ void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
 
        bitmap->magic = 0;
        if (bitmap->description) {
-               ext2fs_free_mem((void **) &bitmap->description);
+               ext2fs_free_mem(&bitmap->description);
                bitmap->description = 0;
        }
        if (bitmap->bitmap) {
-               ext2fs_free_mem((void **) &bitmap->bitmap);
+               ext2fs_free_mem(&bitmap->bitmap);
                bitmap->bitmap = 0;
        }
-       ext2fs_free_mem((void **) &bitmap);
+       ext2fs_free_mem(&bitmap);
 }
 
 void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
@@ -102,27 +97,33 @@ static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
        if (--icache->refcount)
                return;
        if (icache->buffer)
-               ext2fs_free_mem((void **) &icache->buffer);
+               ext2fs_free_mem(&icache->buffer);
        if (icache->cache)
-               ext2fs_free_mem((void **) &icache->cache);
+               ext2fs_free_mem(&icache->cache);
        icache->buffer_blk = 0;
-       ext2fs_free_mem((void **) &icache);
+       ext2fs_free_mem(&icache);
 }
 
 /*
  * This procedure frees a badblocks list.
  */
-void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+void ext2fs_u32_list_free(ext2_u32_list bb)
 {
        if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
                return;
 
        if (bb->list)
-               ext2fs_free_mem((void **) &bb->list);
+               ext2fs_free_mem(&bb->list);
        bb->list = 0;
-       ext2fs_free_mem((void **) &bb);
+       ext2fs_free_mem(&bb);
+}
+
+void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+{
+       ext2fs_u32_list_free((ext2_u32_list) bb);
 }
 
+
 /*
  * Free a directory block list
  */
@@ -132,11 +133,11 @@ void ext2fs_free_dblist(ext2_dblist dblist)
                return;
 
        if (dblist->list)
-               ext2fs_free_mem((void **) &dblist->list);
+               ext2fs_free_mem(&dblist->list);
        dblist->list = 0;
        if (dblist->fs && dblist->fs->dblist == dblist)
                dblist->fs->dblist = 0;
        dblist->magic = 0;
-       ext2fs_free_mem((void **) &dblist);
+       ext2fs_free_mem(&dblist);
 }