Fix dbg_print() format for unsigned long long.

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

diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 93b64ce..4389a2f 100644 (file)
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -69,8 +69,7 @@ blk64_t ext2fs_inode_data_blocks2(ext2_filsys fs,
                                        struct ext2_inode *inode)
 {
        return (inode->i_blocks |
-               ((fs->super->s_feature_ro_compat &
-                 EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ?
+               (ext2fs_has_feature_huge_file(fs->super) ?
                 (__u64) inode->osd2.linux2.l_i_blocks_hi << 32 : 0)) -
                (inode->i_file_acl ? fs->blocksize >> 9 : 0);
 }
@@ -82,8 +81,7 @@ blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
                                        struct ext2_inode *inode)
 {
        return (inode->i_blocks |
-               ((fs->super->s_feature_ro_compat &
-                 EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ?
+               (ext2fs_has_feature_huge_file(fs->super) ?
                 (__u64)inode->osd2.linux2.l_i_blocks_hi << 32 : 0));
 }
 
@@ -93,7 +91,7 @@ blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
 blk64_t ext2fs_blocks_count(struct ext2_super_block *super)
 {
        return super->s_blocks_count |
-               (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(super) ?
                (__u64) super->s_blocks_count_hi << 32 : 0);
 }
 
@@ -103,7 +101,7 @@ blk64_t ext2fs_blocks_count(struct ext2_super_block *super)
 void ext2fs_blocks_count_set(struct ext2_super_block *super, blk64_t blk)
 {
        super->s_blocks_count = blk;
-       if (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(super))
                super->s_blocks_count_hi = (__u64) blk >> 32;
 }
 
@@ -123,7 +121,7 @@ void ext2fs_blocks_count_add(struct ext2_super_block *super, blk64_t blk)
 blk64_t ext2fs_r_blocks_count(struct ext2_super_block *super)
 {
        return super->s_r_blocks_count |
-               (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(super) ?
                (__u64) super->s_r_blocks_count_hi << 32 : 0);
 }
 
@@ -133,7 +131,7 @@ blk64_t ext2fs_r_blocks_count(struct ext2_super_block *super)
 void ext2fs_r_blocks_count_set(struct ext2_super_block *super, blk64_t blk)
 {
        super->s_r_blocks_count = blk;
-       if (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(super))
                super->s_r_blocks_count_hi = (__u64) blk >> 32;
 }
 
@@ -153,7 +151,7 @@ void ext2fs_r_blocks_count_add(struct ext2_super_block *super, blk64_t blk)
 blk64_t ext2fs_free_blocks_count(struct ext2_super_block *super)
 {
        return super->s_free_blocks_count |
-               (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(super) ?
                (__u64) super->s_free_blocks_hi << 32 : 0);
 }
 
@@ -163,7 +161,7 @@ blk64_t ext2fs_free_blocks_count(struct ext2_super_block *super)
 void ext2fs_free_blocks_count_set(struct ext2_super_block *super, blk64_t blk)
 {
        super->s_free_blocks_count = blk;
-       if (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(super))
                super->s_free_blocks_hi = (__u64) blk >> 32;
 }
 
@@ -223,8 +221,7 @@ blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_block_bitmap |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u64)gdp->bg_block_bitmap_hi << 32 : 0);
 }
 
@@ -237,7 +234,7 @@ void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_block_bitmap = blk;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_block_bitmap_hi = (__u64) blk >> 32;
 }
 
@@ -265,8 +262,7 @@ blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_inode_bitmap |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u64) gdp->bg_inode_bitmap_hi << 32 : 0);
 }
 
@@ -279,7 +275,7 @@ void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_inode_bitmap = blk;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_inode_bitmap_hi = (__u64) blk >> 32;
 }
 
@@ -292,8 +288,7 @@ blk64_t ext2fs_inode_table_loc(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_inode_table |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u64) gdp->bg_inode_table_hi << 32 : 0);
 }
 
@@ -306,7 +301,7 @@ void ext2fs_inode_table_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_inode_table = blk;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_inode_table_hi = (__u64) blk >> 32;
 }
 
@@ -319,8 +314,7 @@ __u32 ext2fs_bg_free_blocks_count(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_free_blocks_count |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u32) gdp->bg_free_blocks_count_hi << 16 : 0);
 }
 
@@ -334,7 +328,7 @@ void ext2fs_bg_free_blocks_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_free_blocks_count = n;
 
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_free_blocks_count_hi = (__u32) n >> 16;
 }
 
@@ -347,8 +341,7 @@ __u32 ext2fs_bg_free_inodes_count(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_free_inodes_count |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u32) gdp->bg_free_inodes_count_hi << 16 : 0);
 }
 
@@ -361,7 +354,7 @@ void ext2fs_bg_free_inodes_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_free_inodes_count = n;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_free_inodes_count_hi = (__u32) n >> 16;
 }
 
@@ -374,8 +367,7 @@ __u32 ext2fs_bg_used_dirs_count(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_used_dirs_count |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u32) gdp->bg_used_dirs_count_hi << 16 : 0);
 }
 
@@ -388,7 +380,7 @@ void ext2fs_bg_used_dirs_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_used_dirs_count = n;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_used_dirs_count_hi = (__u32) n >> 16;
 }
 
@@ -401,8 +393,7 @@ __u32 ext2fs_bg_itable_unused(ext2_filsys fs, dgrp_t group)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        return gdp->bg_itable_unused |
-               (fs->super->s_feature_incompat
-                & EXT4_FEATURE_INCOMPAT_64BIT ?
+               (ext2fs_has_feature_64bit(fs->super) ?
                 (__u32) gdp->bg_itable_unused_hi << 16 : 0);
 }
 
@@ -415,7 +406,7 @@ void ext2fs_bg_itable_unused_set(ext2_filsys fs, dgrp_t group, __u32 n)
 
        gdp = ext4fs_group_desc(fs, fs->group_desc, group);
        gdp->bg_itable_unused = n;
-       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (ext2fs_has_feature_64bit(fs->super))
                gdp->bg_itable_unused_hi = (__u32) n >> 16;
 }
 
@@ -507,7 +498,7 @@ blk64_t ext2fs_file_acl_block(ext2_filsys fs, const struct ext2_inode *inode)
 {
        blk64_t blk = inode->i_file_acl;
 
-       if (fs && fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (fs && ext2fs_has_feature_64bit(fs->super))
                blk |= ((__u64) inode->osd2.linux2.l_i_file_acl_high) << 32;
        return blk;
 }
@@ -519,7 +510,7 @@ void ext2fs_file_acl_block_set(ext2_filsys fs, struct ext2_inode *inode,
                               blk64_t blk)
 {
        inode->i_file_acl = blk;
-       if (fs && fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+       if (fs && ext2fs_has_feature_64bit(fs->super))
                inode->osd2.linux2.l_i_file_acl_high = (__u64) blk >> 32;
 }
 
@@ -536,11 +527,9 @@ errcode_t ext2fs_inode_size_set(ext2_filsys fs, struct ext2_inode *inode,
        /* If we're writing a large file, set the large_file flag */
        if (LINUX_S_ISREG(inode->i_mode) &&
            ext2fs_needs_large_file_feature(size) &&
-           (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-                                        EXT2_FEATURE_RO_COMPAT_LARGE_FILE) ||
+           (!ext2fs_has_feature_large_file(fs->super) ||
             fs->super->s_rev_level == EXT2_GOOD_OLD_REV)) {
-               fs->super->s_feature_ro_compat |=
-                                       EXT2_FEATURE_RO_COMPAT_LARGE_FILE;
+               ext2fs_set_feature_large_file(fs->super);
                ext2fs_update_dynamic_rev(fs);
                ext2fs_mark_super_dirty(fs);
        }