|
@@ -4649,7 +4649,7 @@ static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
int num_pages;
|
|
int num_pages;
|
|
- int mapped = !test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags);
|
|
|
|
|
|
+ int mapped = !test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags);
|
|
|
|
|
|
BUG_ON(extent_buffer_under_io(eb));
|
|
BUG_ON(extent_buffer_under_io(eb));
|
|
|
|
|
|
@@ -4763,7 +4763,7 @@ struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src)
|
|
}
|
|
}
|
|
|
|
|
|
set_bit(EXTENT_BUFFER_UPTODATE, &new->bflags);
|
|
set_bit(EXTENT_BUFFER_UPTODATE, &new->bflags);
|
|
- set_bit(EXTENT_BUFFER_DUMMY, &new->bflags);
|
|
|
|
|
|
+ set_bit(EXTENT_BUFFER_UNMAPPED, &new->bflags);
|
|
|
|
|
|
return new;
|
|
return new;
|
|
}
|
|
}
|
|
@@ -4787,7 +4787,7 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
|
|
}
|
|
}
|
|
set_extent_buffer_uptodate(eb);
|
|
set_extent_buffer_uptodate(eb);
|
|
btrfs_set_header_nritems(eb, 0);
|
|
btrfs_set_header_nritems(eb, 0);
|
|
- set_bit(EXTENT_BUFFER_DUMMY, &eb->bflags);
|
|
|
|
|
|
+ set_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags);
|
|
|
|
|
|
return eb;
|
|
return eb;
|
|
err:
|
|
err:
|
|
@@ -5088,7 +5088,7 @@ static int release_extent_buffer(struct extent_buffer *eb)
|
|
/* Should be safe to release our pages at this point */
|
|
/* Should be safe to release our pages at this point */
|
|
btrfs_release_extent_buffer_pages(eb);
|
|
btrfs_release_extent_buffer_pages(eb);
|
|
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
|
|
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
|
|
- if (unlikely(test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags))) {
|
|
|
|
|
|
+ if (unlikely(test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags))) {
|
|
__free_extent_buffer(eb);
|
|
__free_extent_buffer(eb);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
@@ -5119,7 +5119,7 @@ void free_extent_buffer(struct extent_buffer *eb)
|
|
|
|
|
|
spin_lock(&eb->refs_lock);
|
|
spin_lock(&eb->refs_lock);
|
|
if (atomic_read(&eb->refs) == 2 &&
|
|
if (atomic_read(&eb->refs) == 2 &&
|
|
- test_bit(EXTENT_BUFFER_DUMMY, &eb->bflags))
|
|
|
|
|
|
+ test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags))
|
|
atomic_dec(&eb->refs);
|
|
atomic_dec(&eb->refs);
|
|
|
|
|
|
if (atomic_read(&eb->refs) == 2 &&
|
|
if (atomic_read(&eb->refs) == 2 &&
|