Supplied changelog for resize inode patch.

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

diff --git a/lib/ext2fs/rs_bitmap.c b/lib/ext2fs/rs_bitmap.c
index c41b5e6..46653f0 100644 (file)
--- a/lib/ext2fs/rs_bitmap.c
+++ b/lib/ext2fs/rs_bitmap.c
@@ -11,29 +11,30 @@
 
 #include <stdio.h>
 #include <string.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <fcntl.h>
 #include <time.h>
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#if HAVE_ERRNO_H
-#include <errno.h>
 #endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
 errcode_t ext2fs_resize_generic_bitmap(__u32 new_end, __u32 new_real_end,
                                       ext2fs_generic_bitmap bmap)
 {
-       size_t  size, new_size;
-       char    *new_bitmap;
-       __u32   bitno;
+       errcode_t       retval;
+       size_t          size, new_size;
+       __u32           bitno;
 
        if (!bmap)
-               return EINVAL;
+               return EXT2_ET_INVALID_ARGUMENT;
 
        EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_GENERIC_BITMAP);
 
@@ -56,13 +57,14 @@ errcode_t ext2fs_resize_generic_bitmap(__u32 new_end, __u32 new_real_end,
        size = ((bmap->real_end - bmap->start) / 8) + 1;
        new_size = ((new_real_end - bmap->start) / 8) + 1;
 
-       new_bitmap = realloc(bmap->bitmap, new_size);
-       if (!new_bitmap)
-               return ENOMEM;
+       if (size != new_size) {
+               retval = ext2fs_resize_mem(size, new_size, &bmap->bitmap);
+               if (retval)
+                       return retval;
+       }
        if (new_size > size)
-               memset(new_bitmap + size, 0, new_size - size);
+               memset(bmap->bitmap + size, 0, new_size - size);
 
-       bmap->bitmap = new_bitmap;
        bmap->end = new_end;
        bmap->real_end = new_real_end;
        return 0;
@@ -74,7 +76,7 @@ errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
        errcode_t       retval;
        
        if (!bmap)
-               return EINVAL;
+               return EXT2_ET_INVALID_ARGUMENT;
 
        EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_INODE_BITMAP);
 
@@ -91,7 +93,7 @@ errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
        errcode_t       retval;
        
        if (!bmap)
-               return EINVAL;
+               return EXT2_ET_INVALID_ARGUMENT;
 
        EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_BLOCK_BITMAP);