libext2fs: 32-bit bitmap refactorization, part 2

Move the contents of rs_bitmap.c and cmp_bitmaps.c into gen_bitmap.c
and bitmaps.c.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index db6820b..70e18e7 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -7,10 +7,10 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
-@DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o cmp_bitmaps.o fileio.o \
+@DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o fileio.o \
 @DEBUGFS_CMT@  inode_io.o namei.o write_bb_file.o 
 
-@RESIZER_CMT@RESIZE_LIB_OBJS = rs_bitmap.o dupfs.o test_io.o 
+@RESIZER_CMT@RESIZE_LIB_OBJS = dupfs.o test_io.o 
 
 @IMAGER_CMT@E2IMAGE_LIB_OBJS = imager.o
 
@@ -82,7 +82,6 @@ SRCS= ext2_err.c \
        $(srcdir)/bmap.c \
        $(srcdir)/check_desc.c \
        $(srcdir)/closefs.c \
-       $(srcdir)/cmp_bitmaps.c \
        $(srcdir)/dblist.c \
        $(srcdir)/dblist_dir.c \
        $(srcdir)/dirblock.c \
@@ -120,7 +119,6 @@ SRCS= ext2_err.c \
        $(srcdir)/read_bb.c \
        $(srcdir)/read_bb_file.c \
        $(srcdir)/res_gdt.c \
-       $(srcdir)/rs_bitmap.c \
        $(srcdir)/rw_bitmaps.c \
        $(srcdir)/swapfs.c \
        $(srcdir)/tdb.c \
@@ -361,10 +359,6 @@ closefs.o: $(srcdir)/closefs.c $(srcdir)/ext2_fs.h \
  $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
-cmp_bitmaps.o: $(srcdir)/cmp_bitmaps.c $(srcdir)/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
- $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
 dblist.o: $(srcdir)/dblist.c $(srcdir)/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
  $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
@@ -523,10 +517,6 @@ res_gdt.o: $(srcdir)/res_gdt.c $(srcdir)/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
  $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
  $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
-rs_bitmap.o: $(srcdir)/rs_bitmap.c $(srcdir)/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
- $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/bitops.h
 rw_bitmaps.o: $(srcdir)/rw_bitmaps.c $(srcdir)/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
  $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \

diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
index e6c2849..7d14cff 100644 (file)
--- a/lib/ext2fs/bitmaps.c
+++ b/lib/ext2fs/bitmaps.c
@@ -117,3 +117,34 @@ void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap)
 {
        ext2fs_clear_generic_bitmap(bitmap);
 }
+
+errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
+                                    ext2fs_inode_bitmap bmap)
+{
+       return (ext2fs_resize_generic_bitmap(EXT2_ET_MAGIC_INODE_BITMAP,
+                                            new_end, new_real_end, bmap));
+}
+
+errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
+                                    ext2fs_block_bitmap bmap)
+{
+       return (ext2fs_resize_generic_bitmap(EXT2_ET_MAGIC_BLOCK_BITMAP,
+                                            new_end, new_real_end, bmap));
+}
+
+errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
+                                     ext2fs_block_bitmap bm2)
+{
+       return (ext2fs_compare_generic_bitmap(EXT2_ET_MAGIC_BLOCK_BITMAP,
+                                             EXT2_ET_NEQ_BLOCK_BITMAP,
+                                             bm1, bm2));
+}
+
+errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
+                                     ext2fs_inode_bitmap bm2)
+{
+       return (ext2fs_compare_generic_bitmap(EXT2_ET_MAGIC_INODE_BITMAP,
+                                             EXT2_ET_NEQ_INODE_BITMAP,
+                                             bm1, bm2));
+}
+

diff --git a/lib/ext2fs/cmp_bitmaps.c b/lib/ext2fs/cmp_bitmaps.c
deleted file mode 100644 (file)
index 51cc3d0..0000000
--- a/lib/ext2fs/cmp_bitmaps.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * cmp_bitmaps.c --- routines to compare inode and block bitmaps.
- *
- * Copyright (C) 1995 Theodore Ts'o.
- *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
- * %End-Header%
- */
-
-#include <stdio.h>
-#include <string.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#include <time.h>
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include "ext2_fs.h"
-#include "ext2fs.h"
-
-errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
-                                     ext2fs_block_bitmap bm2)
-{
-       blk_t   i;
-       
-       EXT2_CHECK_MAGIC(bm1, EXT2_ET_MAGIC_BLOCK_BITMAP);
-       EXT2_CHECK_MAGIC(bm2, EXT2_ET_MAGIC_BLOCK_BITMAP);
-
-       if ((bm1->start != bm2->start) ||
-           (bm1->end != bm2->end) ||
-           (memcmp(bm1->bitmap, bm2->bitmap,
-                   (size_t) (bm1->end - bm1->start)/8)))
-               return EXT2_ET_NEQ_BLOCK_BITMAP;
-
-       for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)
-               if (ext2fs_fast_test_block_bitmap(bm1, i) !=
-                   ext2fs_fast_test_block_bitmap(bm2, i))
-                       return EXT2_ET_NEQ_BLOCK_BITMAP;
-
-       return 0;
-}
-
-errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
-                                     ext2fs_inode_bitmap bm2)
-{
-       ext2_ino_t      i;
-       
-       EXT2_CHECK_MAGIC(bm1, EXT2_ET_MAGIC_INODE_BITMAP);
-       EXT2_CHECK_MAGIC(bm2, EXT2_ET_MAGIC_INODE_BITMAP);
-
-       if ((bm1->start != bm2->start) ||
-           (bm1->end != bm2->end) ||
-           (memcmp(bm1->bitmap, bm2->bitmap,
-                   (size_t) (bm1->end - bm1->start)/8)))
-               return EXT2_ET_NEQ_INODE_BITMAP;
-
-       for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)
-               if (ext2fs_fast_test_inode_bitmap(bm1, i) !=
-                   ext2fs_fast_test_inode_bitmap(bm2, i))
-                       return EXT2_ET_NEQ_INODE_BITMAP;
-
-       return 0;
-}
-

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 540af9d..5ce018d 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -571,6 +571,15 @@ extern void ext2fs_clear_inode_bitmap(ext2fs_inode_bitmap bitmap);
 extern void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap);
 extern errcode_t ext2fs_read_bitmaps(ext2_filsys fs);
 extern errcode_t ext2fs_write_bitmaps(ext2_filsys fs);
+extern errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
+                                           ext2fs_inode_bitmap bmap);
+extern errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
+                                           ext2fs_block_bitmap bmap);
+extern errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
+                                            ext2fs_block_bitmap bm2);
+extern errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
+                                            ext2fs_inode_bitmap bm2);
+
 
 /* block.c */
 extern errcode_t ext2fs_block_iterate(ext2_filsys fs,
@@ -624,12 +633,6 @@ extern int ext2fs_super_and_bgd_loc(ext2_filsys fs,
                                    int *ret_meta_bg);
 extern void ext2fs_update_dynamic_rev(ext2_filsys fs);
 
-/* cmp_bitmaps.c */
-extern errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
-                                            ext2fs_block_bitmap bm2);
-extern errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
-                                            ext2fs_inode_bitmap bm2);
-
 /* dblist.c */
 
 extern errcode_t ext2fs_get_num_dirs(ext2_filsys fs, ext2_ino_t *ret_num_dirs);
@@ -772,6 +775,13 @@ extern errcode_t ext2fs_fudge_generic_bitmap_end(ext2fs_inode_bitmap bitmap,
                                                 ext2_ino_t end, 
                                                 ext2_ino_t *oend);
 extern void ext2fs_set_generic_bitmap_padding(ext2fs_generic_bitmap map);
+extern errcode_t ext2fs_resize_generic_bitmap(errcode_t magic,
+                                             __u32 new_end,
+                                             __u32 new_real_end,
+                                             ext2fs_generic_bitmap bmap);
+extern errcode_t ext2fs_compare_generic_bitmap(errcode_t magic, errcode_t neq,
+                                              ext2fs_generic_bitmap bm1,
+                                              ext2fs_generic_bitmap bm2);
 
 /* getsize.c */
 extern errcode_t ext2fs_get_device_size(const char *file, int blocksize,
@@ -943,17 +953,6 @@ extern errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f,
 /* res_gdt.c */
 extern errcode_t ext2fs_create_resize_inode(ext2_filsys fs);
 
-/* rs_bitmap.c */
-extern errcode_t ext2fs_resize_generic_bitmap(__u32 new_end,
-                                             __u32 new_real_end,
-                                             ext2fs_generic_bitmap bmap);
-extern errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
-                                           ext2fs_inode_bitmap bmap);
-extern errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
-                                           ext2fs_block_bitmap bmap);
-extern errcode_t ext2fs_copy_bitmap(ext2fs_generic_bitmap src,
-                                   ext2fs_generic_bitmap *dest);
-
 /* swapfs.c */
 extern void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, 
                                 int has_header);

diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c
index ce8312f..5de8198 100644 (file)
--- a/lib/ext2fs/gen_bitmap.c
+++ b/lib/ext2fs/gen_bitmap.c
@@ -207,6 +207,74 @@ errcode_t ext2fs_fudge_generic_bitmap_end(ext2fs_inode_bitmap bitmap,
        return 0;
 }
 
+errcode_t ext2fs_resize_generic_bitmap(errcode_t magic,
+                                      __u32 new_end, __u32 new_real_end,
+                                      ext2fs_generic_bitmap bmap)
+{
+       errcode_t       retval;
+       size_t          size, new_size;
+       __u32           bitno;
+
+       if (!bmap || (bmap->magic != magic))
+               return magic;
+
+       /*
+        * If we're expanding the bitmap, make sure all of the new
+        * parts of the bitmap are zero.
+        */
+       if (new_end > bmap->end) {
+               bitno = bmap->real_end;
+               if (bitno > new_end)
+                       bitno = new_end;
+               for (; bitno > bmap->end; bitno--)
+                       ext2fs_clear_bit(bitno - bmap->start, bmap->bitmap);
+       }
+       if (new_real_end == bmap->real_end) {
+               bmap->end = new_end;
+               return 0;
+       }
+       
+       size = ((bmap->real_end - bmap->start) / 8) + 1;
+       new_size = ((new_real_end - bmap->start) / 8) + 1;
+
+       if (size != new_size) {
+               retval = ext2fs_resize_mem(size, new_size, &bmap->bitmap);
+               if (retval)
+                       return retval;
+       }
+       if (new_size > size)
+               memset(bmap->bitmap + size, 0, new_size - size);
+
+       bmap->end = new_end;
+       bmap->real_end = new_real_end;
+       return 0;
+}
+
+errcode_t ext2fs_compare_generic_bitmap(errcode_t magic, errcode_t neq,
+                                       ext2fs_generic_bitmap bm1,
+                                       ext2fs_generic_bitmap bm2)
+{
+       blk_t   i;
+       
+       if (!bm1 || bm1->magic != magic)
+               return magic;
+       if (!bm2 || bm2->magic != magic)
+               return magic;
+
+       if ((bm1->start != bm2->start) ||
+           (bm1->end != bm2->end) ||
+           (memcmp(bm1->bitmap, bm2->bitmap,
+                   (size_t) (bm1->end - bm1->start)/8)))
+               return neq;
+
+       for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)
+               if (ext2fs_fast_test_block_bitmap(bm1, i) !=
+                   ext2fs_fast_test_block_bitmap(bm2, i))
+                       return neq;
+
+       return 0;
+}
+
 void ext2fs_set_generic_bitmap_padding(ext2fs_generic_bitmap map)
 {
        __u32   i, j;
@@ -263,4 +331,3 @@ void ext2fs_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
                ext2fs_fast_clear_bit(block + i - bitmap->start, 
                                      bitmap->bitmap);
 }
-

diff --git a/lib/ext2fs/rs_bitmap.c b/lib/ext2fs/rs_bitmap.c
deleted file mode 100644 (file)
index 46653f0..0000000
--- a/lib/ext2fs/rs_bitmap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * rs_bitmap.c --- routine for changing the size of a bitmap
- *
- * Copyright (C) 1996, 1997 Theodore Ts'o.
- *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
- * %End-Header%
- */
-
-#include <stdio.h>
-#include <string.h>
-#if HAVE_UNISTD_H
-#include <unistd.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>
-#endif
-
-#include "ext2_fs.h"
-#include "ext2fs.h"
-
-errcode_t ext2fs_resize_generic_bitmap(__u32 new_end, __u32 new_real_end,
-                                      ext2fs_generic_bitmap bmap)
-{
-       errcode_t       retval;
-       size_t          size, new_size;
-       __u32           bitno;
-
-       if (!bmap)
-               return EXT2_ET_INVALID_ARGUMENT;
-
-       EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_GENERIC_BITMAP);
-
-       /*
-        * If we're expanding the bitmap, make sure all of the new
-        * parts of the bitmap are zero.
-        */
-       if (new_end > bmap->end) {
-               bitno = bmap->real_end;
-               if (bitno > new_end)
-                       bitno = new_end;
-               for (; bitno > bmap->end; bitno--)
-                       ext2fs_clear_bit(bitno - bmap->start, bmap->bitmap);
-       }
-       if (new_real_end == bmap->real_end) {
-               bmap->end = new_end;
-               return 0;
-       }
-       
-       size = ((bmap->real_end - bmap->start) / 8) + 1;
-       new_size = ((new_real_end - bmap->start) / 8) + 1;
-
-       if (size != new_size) {
-               retval = ext2fs_resize_mem(size, new_size, &bmap->bitmap);
-               if (retval)
-                       return retval;
-       }
-       if (new_size > size)
-               memset(bmap->bitmap + size, 0, new_size - size);
-
-       bmap->end = new_end;
-       bmap->real_end = new_real_end;
-       return 0;
-}
-
-errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
-                                    ext2fs_inode_bitmap bmap)
-{
-       errcode_t       retval;
-       
-       if (!bmap)
-               return EXT2_ET_INVALID_ARGUMENT;
-
-       EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_INODE_BITMAP);
-
-       bmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       retval = ext2fs_resize_generic_bitmap(new_end, new_real_end,
-                                             bmap);
-       bmap->magic = EXT2_ET_MAGIC_INODE_BITMAP;
-       return retval;
-}
-
-errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
-                                    ext2fs_block_bitmap bmap)
-{
-       errcode_t       retval;
-       
-       if (!bmap)
-               return EXT2_ET_INVALID_ARGUMENT;
-
-       EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
-
-       bmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-       retval = ext2fs_resize_generic_bitmap(new_end, new_real_end,
-                                             bmap);
-       bmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP;
-       return retval;
-}
-