vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint' into next

debian
Theodore Ts'o 2016-03-06 21:30:07 -05:00
parent dcb8e1fa04 539d3ae3da
commit 6d4bb11487
4 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ext2fs/blkmap64_rb.c
View File

@ -488,7 +488,7 @@ static int rb_remove_extent(__u64 start, __u64 count,
__u64 new_start, new_count;
int retval = 0;
if (EXT2FS_RB_EMPTY_ROOT(root))
if (ext2fs_rb_empty_root(root))
return 0;
while (*n) {
@ -637,7 +637,7 @@ static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,
n = &bp->root.rb_node;
start -= bitmap->start;
if ((len == 0) || EXT2FS_RB_EMPTY_ROOT(&bp->root))
if (len == 0 || ext2fs_rb_empty_root(&bp->root))
return 1;
/*
@ -739,7 +739,7 @@ static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
n = &bp->root.rb_node;
start -= bitmap->start;
if (EXT2FS_RB_EMPTY_ROOT(&bp->root))
if (ext2fs_rb_empty_root(&bp->root))
return 0;
while (*n) {
@ -819,7 +819,7 @@ static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,
if (start > end)
return EINVAL;
if (EXT2FS_RB_EMPTY_ROOT(&bp->root))
if (ext2fs_rb_empty_root(&bp->root))
return ENOENT;
while (*n) {
@ -856,7 +856,7 @@ static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
if (start > end)
return EINVAL;
if (EXT2FS_RB_EMPTY_ROOT(&bp->root))
if (ext2fs_rb_empty_root(&bp->root))
return ENOENT;
while (*n) {

17
lib/ext2fs/rbtree.h
View File

@ -142,9 +142,20 @@ static inline void ext2fs_rb_set_color(struct rb_node *rb, int color)
#define RB_ROOT (struct rb_root) { NULL, }
#define ext2fs_rb_entry(ptr, type, member) container_of(ptr, type, member)
#define EXT2FS_RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
#define EXT2FS_RB_EMPTY_NODE(node) (ext2fs_rb_parent(node) == node)
#define EXT2FS_RB_CLEAR_NODE(node) (ext2fs_rb_set_parent(node, node))
static inline int ext2fs_rb_empty_root(struct rb_root *root)
{
return root->rb_node == NULL;
}
static inline int ext2fs_rb_empty_node(struct rb_node *node)
{
return ext2fs_rb_parent(node) == node;
}
static inline void ext2fs_rb_clear_node(struct rb_node *node)
{
ext2fs_rb_set_parent(node, node);
}
extern void ext2fs_rb_insert_color(struct rb_node *, struct rb_root *);
extern void ext2fs_rb_erase(struct rb_node *, struct rb_root *);

38
resize/resize2fs.c
View File

@ -61,14 +61,24 @@ static errcode_t move_bg_metadata(ext2_resize_t rfs);
static errcode_t zero_high_bits_in_inodes(ext2_resize_t rfs);
/*
* Some helper CPP macros
* Some helper functions to check if a block is in a metadata area
*/
#define IS_BLOCK_BM(fs, i, blk) ((blk) == ext2fs_block_bitmap_loc((fs),(i)))
#define IS_INODE_BM(fs, i, blk) ((blk) == ext2fs_inode_bitmap_loc((fs),(i)))
static inline int is_block_bm(ext2_filsys fs, unsigned int grp, blk64_t blk)
{
return blk == ext2fs_block_bitmap_loc(fs, grp);
}
#define IS_INODE_TB(fs, i, blk) (((blk) >= ext2fs_inode_table_loc((fs), (i))) && \
((blk) < (ext2fs_inode_table_loc((fs), (i)) + \
(fs)->inode_blocks_per_group)))
static inline int is_inode_bm(ext2_filsys fs, unsigned int grp, blk64_t blk)
{
return blk == ext2fs_inode_bitmap_loc(fs, grp);
}
static inline int is_inode_tb(ext2_filsys fs, unsigned int grp, blk64_t blk)
{
return blk >= ext2fs_inode_table_loc(fs, grp) &&
blk < (ext2fs_inode_table_loc(fs, grp) +
fs->inode_blocks_per_group);
}
/* Some bigalloc helper macros which are more succint... */
#define B2C(x) EXT2FS_B2C(fs, (x))
@ -1166,7 +1176,7 @@ static void mark_fs_metablock(ext2_resize_t rfs,
ext2fs_block_bitmap meta_bmap,
int group, blk64_t blk)
{
ext2_filsys fs = rfs->new_fs;
ext2_filsys fs = rfs->new_fs;
ext2fs_mark_block_bitmap2(rfs->reserve_blocks, blk);
ext2fs_block_alloc_stats2(fs, blk, +1);
@ -1176,17 +1186,17 @@ static void mark_fs_metablock(ext2_resize_t rfs,
* or the inode tables. If not, and the block is in use, then
* mark it as a block to be moved.
*/
if (IS_BLOCK_BM(fs, group, blk)) {
if (is_block_bm(fs, group, blk)) {
ext2fs_block_bitmap_loc_set(fs, group, 0);
rfs->needed_blocks++;
return;
}
if (IS_INODE_BM(fs, group, blk)) {
if (is_inode_bm(fs, group, blk)) {
ext2fs_inode_bitmap_loc_set(fs, group, 0);
rfs->needed_blocks++;
return;
}
if (IS_INODE_TB(fs, group, blk)) {
if (is_inode_tb(fs, group, blk)) {
ext2fs_inode_table_loc_set(fs, group, 0);
rfs->needed_blocks++;
return;
@ -1194,18 +1204,18 @@ static void mark_fs_metablock(ext2_resize_t rfs,
if (ext2fs_has_feature_flex_bg(fs->super)) {
dgrp_t i;
for (i=0; i < rfs->old_fs->group_desc_count; i++) {
if (IS_BLOCK_BM(fs, i, blk)) {
for (i = 0; i < rfs->old_fs->group_desc_count; i++) {
if (is_block_bm(fs, i, blk)) {
ext2fs_block_bitmap_loc_set(fs, i, 0);
rfs->needed_blocks++;
return;
}
if (IS_INODE_BM(fs, i, blk)) {
if (is_inode_bm(fs, i, blk)) {
ext2fs_inode_bitmap_loc_set(fs, i, 0);
rfs->needed_blocks++;
return;
}
if (IS_INODE_TB(fs, i, blk)) {
if (is_inode_tb(fs, i, blk)) {
ext2fs_inode_table_loc_set(fs, i, 0);
rfs->needed_blocks++;
return;

3
tests/f_extent_htree/script
View File

@ -2,8 +2,9 @@
FSCK_OPT="-fyvD"
. $cmd_dir/run_e2fsck
rm -f $TMPFILE
exit $?
exit 0
# This script depends on "mke2fs -d", which is only in master and not maint,
# to populate the file directory tree poorly (namely that there are no
# contiguous blocks in the directory leaf and the extent tree is large).