Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[tools/e2fsprogs.git]
/
lib
/
ext2fs
/
blkmap64_rb.c
diff --git
a/lib/ext2fs/blkmap64_rb.c
b/lib/ext2fs/blkmap64_rb.c
index
ac61653
..
7e7e29d
100644
(file)
--- a/
lib/ext2fs/blkmap64_rb.c
+++ b/
lib/ext2fs/blkmap64_rb.c
@@
-83,7
+83,7
@@
static void print_tree(struct rb_root *root)
static void check_tree(struct rb_root *root, const char *msg)
{
static void check_tree(struct rb_root *root, const char *msg)
{
- struct rb_node *n
ew_node, *node, *next
;
+ struct rb_node *n
ode
;
struct bmap_rb_extent *ext, *old = NULL;
for (node = ext2fs_rb_first(root); node;
struct bmap_rb_extent *ext, *old = NULL;
for (node = ext2fs_rb_first(root); node;
@@
-297,21
+297,19
@@
static errcode_t rb_resize_bmap(ext2fs_generic_bitmap bmap,
{
struct ext2fs_rb_private *bp;
{
struct ext2fs_rb_private *bp;
- if (new_real_end >= bmap->real_end) {
- bmap->end = new_end;
- bmap->real_end = new_real_end;
- return 0;
- }
-
bp = (struct ext2fs_rb_private *) bmap->private;
bp->rcursor = NULL;
bp->wcursor = NULL;
bp = (struct ext2fs_rb_private *) bmap->private;
bp->rcursor = NULL;
bp->wcursor = NULL;
- /* truncate tree to new_real_end size */
-
rb_truncate(new_real_end,
&bp->root);
+ rb_truncate(((new_end < bmap->end) ? new_end : bmap->end) - bmap->start,
+
&bp->root);
bmap->end = new_end;
bmap->real_end = new_real_end;
bmap->end = new_end;
bmap->real_end = new_real_end;
+
+ if (bmap->end < bmap->real_end)
+ rb_insert_extent(bmap->end + 1 - bmap->start,
+ bmap->real_end - bmap->end, bp);
return 0;
}
return 0;
}
@@
-490,7
+488,7
@@
static int rb_remove_extent(__u64 start, __u64 count,
__u64 new_start, new_count;
int retval = 0;
__u64 new_start, new_count;
int retval = 0;
- if (
EXT2FS_RB_EMPTY_ROOT
(root))
+ if (
ext2fs_rb_empty_root
(root))
return 0;
while (*n) {
return 0;
while (*n) {
@@
-639,7
+637,7
@@
static int rb_test_clear_bmap_extent(ext2fs_generic_bitmap bitmap,
n = &bp->root.rb_node;
start -= bitmap->start;
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;
/*
return 1;
/*
@@
-735,14
+733,13
@@
static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
struct rb_node *parent = NULL, *next, **n;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
struct rb_node *parent = NULL, *next, **n;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
- int count;
- __u64 pos;
+ __u64 count, pos;
bp = (struct ext2fs_rb_private *) bitmap->private;
n = &bp->root.rb_node;
start -= bitmap->start;
bp = (struct ext2fs_rb_private *) bitmap->private;
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) {
return 0;
while (*n) {
@@
-767,9
+764,9
@@
static errcode_t rb_get_bmap_range(ext2fs_generic_bitmap bitmap,
if (pos >= start + num)
break;
if (pos < start) {
if (pos >= start + num)
break;
if (pos < start) {
- count -= start - pos;
- if (count < 0)
+ if (pos + count < start)
continue;
continue;
+ count -= start - pos;
pos = start;
}
if (pos + count > start + num)
pos = start;
}
if (pos + count > start + num)
@@
-811,10
+808,8
@@
static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,
__u64 start, __u64 end, __u64 *out)
{
struct rb_node *parent = NULL, **n;
__u64 start, __u64 end, __u64 *out)
{
struct rb_node *parent = NULL, **n;
- struct rb_node *node, *next;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
- int retval = 1;
bp = (struct ext2fs_rb_private *) bitmap->private;
n = &bp->root.rb_node;
bp = (struct ext2fs_rb_private *) bitmap->private;
n = &bp->root.rb_node;
@@
-824,7
+819,7
@@
static errcode_t rb_find_first_zero(ext2fs_generic_bitmap bitmap,
if (start > end)
return EINVAL;
if (start > end)
return EINVAL;
- if (
EXT2FS_RB_EMPTY_ROOT
(&bp->root))
+ if (
ext2fs_rb_empty_root
(&bp->root))
return ENOENT;
while (*n) {
return ENOENT;
while (*n) {
@@
-849,10
+844,9
@@
static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
__u64 start, __u64 end, __u64 *out)
{
struct rb_node *parent = NULL, **n;
__u64 start, __u64 end, __u64 *out)
{
struct rb_node *parent = NULL, **n;
- struct rb_node *node
, *next
;
+ struct rb_node *node;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
struct ext2fs_rb_private *bp;
struct bmap_rb_extent *ext;
- int retval = 1;
bp = (struct ext2fs_rb_private *) bitmap->private;
n = &bp->root.rb_node;
bp = (struct ext2fs_rb_private *) bitmap->private;
n = &bp->root.rb_node;
@@
-862,7
+856,7
@@
static errcode_t rb_find_first_set(ext2fs_generic_bitmap bitmap,
if (start > end)
return EINVAL;
if (start > end)
return EINVAL;
- if (
EXT2FS_RB_EMPTY_ROOT
(&bp->root))
+ if (
ext2fs_rb_empty_root
(&bp->root))
return ENOENT;
while (*n) {
return ENOENT;
while (*n) {