Fix dbg_print() format for unsigned long long.

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

diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
index 91a8c96..8402191 100644 (file)
--- a/lib/ext2fs/bitmaps.c
+++ b/lib/ext2fs/bitmaps.c
@@ -5,11 +5,12 @@
  * 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>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -27,6 +28,7 @@
 #include "ext2_fs.h"
 #include "ext2fs.h"
 #include "ext2fsP.h"
+#include "bmap64.h"
 
 void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
 {
@@ -65,9 +67,9 @@ errcode_t ext2fs_allocate_inode_bitmap(ext2_filsys fs,
        /* Are we permitted to use new-style bitmaps? */
        if (fs->flags & EXT2_FLAG_64BITS)
                return (ext2fs_alloc_generic_bmap(fs,
-                                 EXT2_ET_MAGIC_INODE_BITMAP64,
-                                 EXT2FS_BMAP64_BITARRAY,
-                                 start, end, real_end, descr, ret));
+                               EXT2_ET_MAGIC_INODE_BITMAP64,
+                               fs->default_bitmap_type,
+                               start, end, real_end, descr, ret));
 
        /* Otherwise, check to see if the file system is small enough
         * to use old-style 32-bit bitmaps */
@@ -90,16 +92,16 @@ errcode_t ext2fs_allocate_block_bitmap(ext2_filsys fs,
 
        fs->write_bitmaps = ext2fs_write_bitmaps;
 
-       start = fs->super->s_first_data_block;
-       end = ext2fs_blocks_count(fs->super)-1;
-       real_end = ((__u64) EXT2_BLOCKS_PER_GROUP(fs->super)
+       start = EXT2FS_B2C(fs, fs->super->s_first_data_block);
+       end = EXT2FS_B2C(fs, ext2fs_blocks_count(fs->super)-1);
+       real_end = ((__u64) EXT2_CLUSTERS_PER_GROUP(fs->super)
                    * (__u64) fs->group_desc_count)-1 + start;
 
        if (fs->flags & EXT2_FLAG_64BITS)
                return (ext2fs_alloc_generic_bmap(fs,
-                                 EXT2_ET_MAGIC_BLOCK_BITMAP64,
-                                 EXT2FS_BMAP64_BITARRAY,
-                                 start, end, real_end, descr, ret));
+                               EXT2_ET_MAGIC_BLOCK_BITMAP64,
+                               fs->default_bitmap_type,
+                               start, end, real_end, descr, ret));
 
        if ((end > ~0U) || (real_end > ~0U))
                return EXT2_ET_CANT_USE_LEGACY_BITMAPS;
@@ -110,6 +112,56 @@ errcode_t ext2fs_allocate_block_bitmap(ext2_filsys fs,
                                           (ext2fs_generic_bitmap *) ret));
 }
 
+/*
+ * ext2fs_allocate_block_bitmap() really allocates a per-cluster
+ * bitmap for backwards compatibility.  This function allocates a
+ * block bitmap which is truly per-block, even if clusters/bigalloc
+ * are enabled.  mke2fs and e2fsck need this for tracking the
+ * allocation of the file system metadata blocks.
+ */
+errcode_t ext2fs_allocate_subcluster_bitmap(ext2_filsys fs,
+                                           const char *descr,
+                                           ext2fs_block_bitmap *ret)
+{
+       __u64                   start, end, real_end;
+       ext2fs_generic_bitmap   bmap;
+       errcode_t               retval;
+
+       EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+
+       fs->write_bitmaps = ext2fs_write_bitmaps;
+
+       if (!fs->cluster_ratio_bits)
+               return ext2fs_allocate_block_bitmap(fs, descr, ret);
+
+       if ((fs->flags & EXT2_FLAG_64BITS) == 0)
+               return EXT2_ET_CANT_USE_LEGACY_BITMAPS;
+
+       start = fs->super->s_first_data_block;
+       end = ext2fs_blocks_count(fs->super)-1;
+       real_end = ((__u64) EXT2_BLOCKS_PER_GROUP(fs->super)
+                   * (__u64) fs->group_desc_count)-1 + start;
+
+       retval = ext2fs_alloc_generic_bmap(fs, EXT2_ET_MAGIC_BLOCK_BITMAP64,
+                                          fs->default_bitmap_type, start,
+                                          end, real_end, descr, &bmap);
+       if (retval)
+               return retval;
+       bmap->cluster_bits = 0;
+       *ret = bmap;
+       return 0;
+}
+
+int ext2fs_get_bitmap_granularity(ext2fs_block_bitmap bitmap)
+{
+       ext2fs_generic_bitmap bmap = bitmap;
+
+       if (!EXT2FS_IS_64_BITMAP(bmap))
+               return 0;
+
+       return bmap->cluster_bits;
+}
+
 errcode_t ext2fs_fudge_inode_bitmap_end(ext2fs_inode_bitmap bitmap,
                                        ext2_ino_t end, ext2_ino_t *oend)
 {