ChangeLog, openfs.c:

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

diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c
index 215d1fb..e5db058 100644 (file)
--- a/lib/ext2fs/freefs.c
+++ b/lib/ext2fs/freefs.c
@@ -10,12 +10,19 @@
  */
 
 #include <stdio.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 
+#if EXT2_FLAT_INCLUDES
+#include "ext2_fs.h"
+#else
 #include <linux/ext2_fs.h>
+#endif
 
-#include "ext2fs.h"
+#include "ext2fsP.h"
+
+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache);
 
 void ext2fs_free(ext2_filsys fs)
 {
@@ -25,11 +32,11 @@ void ext2fs_free(ext2_filsys fs)
                io_channel_close(fs->io);
        }
        if (fs->device_name)
-               free(fs->device_name);
+               ext2fs_free_mem((void **) &fs->device_name);
        if (fs->super)
-               free(fs->super);
+               ext2fs_free_mem((void **) &fs->super);
        if (fs->group_desc)
-               free(fs->group_desc);
+               ext2fs_free_mem((void **) &fs->group_desc);
        if (fs->block_map)
                ext2fs_free_block_bitmap(fs->block_map);
        if (fs->inode_map)
@@ -41,10 +48,13 @@ void ext2fs_free(ext2_filsys fs)
 
        if (fs->dblist)
                ext2fs_free_dblist(fs->dblist);
+
+       if (fs->icache)
+               ext2fs_free_inode_cache(fs->icache);
        
        fs->magic = 0;
 
-       free(fs);
+       ext2fs_free_mem((void **) &fs);
 }
 
 void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
@@ -54,14 +64,14 @@ void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
 
        bitmap->magic = 0;
        if (bitmap->description) {
-               free(bitmap->description);
+               ext2fs_free_mem((void **) &bitmap->description);
                bitmap->description = 0;
        }
        if (bitmap->bitmap) {
-               free(bitmap->bitmap);
+               ext2fs_free_mem((void **) &bitmap->bitmap);
                bitmap->bitmap = 0;
        }
-       free(bitmap);
+       ext2fs_free_mem((void **) &bitmap);
 }
 
 void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
@@ -82,3 +92,49 @@ void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap)
        ext2fs_free_generic_bitmap(bitmap);
 }
 
+/*
+ * Free the inode cache structure
+ */
+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
+{
+       if (--icache->refcount)
+               return;
+       if (icache->buffer)
+               ext2fs_free_mem((void **) &icache->buffer);
+       if (icache->cache)
+               ext2fs_free_mem((void **) &icache->cache);
+       icache->buffer_blk = 0;
+       ext2fs_free_mem((void **) &icache);
+}
+
+/*
+ * This procedure frees a badblocks list.
+ */
+void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+{
+       if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
+               return;
+
+       if (bb->list)
+               ext2fs_free_mem((void **) &bb->list);
+       bb->list = 0;
+       ext2fs_free_mem((void **) &bb);
+}
+
+/*
+ * Free a directory block list
+ */
+void ext2fs_free_dblist(ext2_dblist dblist)
+{
+       if (!dblist || (dblist->magic != EXT2_ET_MAGIC_DBLIST))
+               return;
+
+       if (dblist->list)
+               ext2fs_free_mem((void **) &dblist->list);
+       dblist->list = 0;
+       if (dblist->fs && dblist->fs->dblist == dblist)
+               dblist->fs->dblist = 0;
+       dblist->magic = 0;
+       ext2fs_free_mem((void **) &dblist);
+}
+