korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs: Fix delayed allocation to avoid missing delalloc extents

Browse Source 
find_lock_delalloc_range could exit out too early

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-12-18 16:25:45 -05:00
parent 4aec2b5232
commit 190662b212
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/extent_map.c
View File

@ -1070,6 +1070,7 @@ u64 find_lock_delalloc_range(struct extent_map_tree *tree,
search_again: search_again:
node = tree_search(&tree->state, cur_start); node = tree_search(&tree->state, cur_start);
if (!node || IS_ERR(node)) { if (!node || IS_ERR(node)) {
*end = (u64)-1;
goto out; goto out;
} }
@ -1079,6 +1080,8 @@ search_again:
goto out; goto out;
} }
if (!(state->state & EXTENT_DELALLOC)) { if (!(state->state & EXTENT_DELALLOC)) {
if (!found)
*end = state->end;
goto out; goto out;
} }
if (!found) { if (!found) {
@ -1841,8 +1844,10 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
nr_delalloc = find_lock_delalloc_range(tree, &delalloc_start, nr_delalloc = find_lock_delalloc_range(tree, &delalloc_start,
&delalloc_end, &delalloc_end,
128 * 1024 * 1024); 128 * 1024 * 1024);
if (nr_delalloc <= 0) if (nr_delalloc == 0) {
break; delalloc_start = delalloc_end + 1;
continue;
}
tree->ops->fill_delalloc(inode, delalloc_start, tree->ops->fill_delalloc(inode, delalloc_start,
delalloc_end); delalloc_end);
clear_extent_bit(tree, delalloc_start, clear_extent_bit(tree, delalloc_start,

1
fs/btrfs/inode.c
View File

@ -798,6 +798,7 @@ static int btrfs_cow_one_page(struct inode *inode, struct page *page,
u64 page_start = (u64)page->index << PAGE_CACHE_SHIFT; u64 page_start = (u64)page->index << PAGE_CACHE_SHIFT;
u64 page_end = page_start + PAGE_CACHE_SIZE - 1; u64 page_end = page_start + PAGE_CACHE_SIZE - 1;
WARN_ON(!PageLocked(page));
set_page_extent_mapped(page); set_page_extent_mapped(page);
lock_extent(em_tree, page_start, page_end, GFP_NOFS); lock_extent(em_tree, page_start, page_end, GFP_NOFS);