LU-6722 jbd: double minimum journal size for RHEL7

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

diff --git a/lib/ext2fs/freefs.c b/lib/ext2fs/freefs.c
index 215d1fb..1ad2d91 100644 (file)
--- a/lib/ext2fs/freefs.c
+++ b/lib/ext2fs/freefs.c
@@ -1,84 +1,120 @@
 /*
  * freefs.c --- free an ext2 filesystem
- * 
+ *
  * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 
-#include <linux/ext2_fs.h>
+#include "ext2_fs.h"
+#include "ext2fsP.h"
 
-#include "ext2fs.h"
+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache);
 
 void ext2fs_free(ext2_filsys fs)
 {
        if (!fs || (fs->magic != EXT2_ET_MAGIC_EXT2FS_FILSYS))
                return;
+       if (fs->image_io != fs->io) {
+               if (fs->image_io)
+                       io_channel_close(fs->image_io);
+       }
        if (fs->io) {
                io_channel_close(fs->io);
        }
        if (fs->device_name)
-               free(fs->device_name);
+               ext2fs_free_mem(&fs->device_name);
        if (fs->super)
-               free(fs->super);
+               ext2fs_free_mem(&fs->super);
+       if (fs->orig_super)
+               ext2fs_free_mem(&fs->orig_super);
        if (fs->group_desc)
-               free(fs->group_desc);
+               ext2fs_free_mem(&fs->group_desc);
        if (fs->block_map)
                ext2fs_free_block_bitmap(fs->block_map);
        if (fs->inode_map)
                ext2fs_free_inode_bitmap(fs->inode_map);
+       if (fs->image_header)
+               ext2fs_free_mem(&fs->image_header);
 
        if (fs->badblocks)
-               badblocks_list_free(fs->badblocks);
+               ext2fs_badblocks_list_free(fs->badblocks);
        fs->badblocks = 0;
 
        if (fs->dblist)
                ext2fs_free_dblist(fs->dblist);
-       
+
+       if (fs->icache)
+               ext2fs_free_inode_cache(fs->icache);
+
+       if (fs->mmp_buf)
+               ext2fs_free_mem(&fs->mmp_buf);
+       if (fs->mmp_cmp)
+               ext2fs_free_mem(&fs->mmp_cmp);
+
        fs->magic = 0;
 
-       free(fs);
+       ext2fs_free_mem(&fs);
 }
 
-void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
+/*
+ * Free the inode cache structure
+ */
+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
 {
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_GENERIC_BITMAP))
+       if (--icache->refcount)
                return;
-
-       bitmap->magic = 0;
-       if (bitmap->description) {
-               free(bitmap->description);
-               bitmap->description = 0;
-       }
-       if (bitmap->bitmap) {
-               free(bitmap->bitmap);
-               bitmap->bitmap = 0;
-       }
-       free(bitmap);
+       if (icache->buffer)
+               ext2fs_free_mem(&icache->buffer);
+       if (icache->cache)
+               ext2fs_free_mem(&icache->cache);
+       icache->buffer_blk = 0;
+       ext2fs_free_mem(&icache);
 }
 
-void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
+/*
+ * This procedure frees a badblocks list.
+ */
+void ext2fs_u32_list_free(ext2_u32_list bb)
 {
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_INODE_BITMAP))
+       if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
                return;
 
-       bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       ext2fs_free_generic_bitmap(bitmap);
+       if (bb->list)
+               ext2fs_free_mem(&bb->list);
+       bb->list = 0;
+       ext2fs_free_mem(&bb);
 }
 
-void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap)
+void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
+{
+       ext2fs_u32_list_free((ext2_u32_list) bb);
+}
+
+
+/*
+ * Free a directory block list
+ */
+void ext2fs_free_dblist(ext2_dblist dblist)
 {
-       if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_BLOCK_BITMAP))
+       if (!dblist || (dblist->magic != EXT2_ET_MAGIC_DBLIST))
                return;
 
-       bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       ext2fs_free_generic_bitmap(bitmap);
+       if (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(&dblist);
 }