lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Fix duplicate ENOSPC checks in find_free_extent

Browse Source 
find_free_extent would fail to wrap around to the start of the drive because
it was doing the enospc case checking twice in some cases, causing it
to return -ENOSPC early.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2007-09-17 11:00:51 -04:00
parent d3c2fdcf7b
commit cf67582bb2
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/btrfs/extent-tree.c
View File

@@ -1111,20 +1111,9 @@ check_pending:
btrfs_release_path(root, path); btrfs_release_path(root, path);
BUG_ON(ins->objectid < search_start); BUG_ON(ins->objectid < search_start);
if (ins->objectid + num_blocks >= search_end) { if (ins->objectid + num_blocks >= search_end)
if (full_scan) { goto enospc;
ret = -ENOSPC;
goto error;
}
search_start = orig_search_start;
if (wrapped) {
if (!full_scan)
total_needed -= empty_size;
full_scan = 1;
} else
wrapped = 1;
goto new_group;
}
for (test_block = ins->objectid; for (test_block = ins->objectid;
test_block < ins->objectid + num_blocks; test_block++) { test_block < ins->objectid + num_blocks; test_block++) {
if (test_radix_bit(&info->pinned_radix, test_block) || if (test_radix_bit(&info->pinned_radix, test_block) ||
@@ -1149,6 +1138,7 @@ check_pending:
new_group: new_group:
if (search_start + num_blocks >= search_end) { if (search_start + num_blocks >= search_end) {
enospc:
search_start = orig_search_start; search_start = orig_search_start;
if (full_scan) { if (full_scan) {
ret = -ENOSPC; ret = -ENOSPC;