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

Btrfs: Add data block hints to SSD mode too

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2008-01-31 16:45:07 -05:00
parent b0c68f8bed
commit 4529ba495c
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/btrfs/ctree.h
View File

@@ -354,6 +354,7 @@ struct btrfs_fs_info {
spinlock_t new_trans_lock; spinlock_t new_trans_lock;
u64 delalloc_bytes; u64 delalloc_bytes;
u64 last_alloc; u64 last_alloc;
u64 last_data_alloc;
}; };
/* /*
* in ram representation of the tree. extent_root is used for all allocations * in ram representation of the tree. extent_root is used for all allocations

1
fs/btrfs/disk-io.c
View File

@@ -688,6 +688,7 @@ struct btrfs_root *open_ctree(struct super_block *sb)
fs_info->closing = 0; fs_info->closing = 0;
fs_info->total_pinned = 0; fs_info->total_pinned = 0;
fs_info->last_alloc = 0; fs_info->last_alloc = 0;
fs_info->last_data_alloc = 0;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info); INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info);

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

@@ -1410,6 +1410,7 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
int ret; int ret;
int slot = 0; int slot = 0;
u64 last_byte = 0; u64 last_byte = 0;
u64 *last_ptr = NULL;
u64 orig_search_start = search_start; u64 orig_search_start = search_start;
int start_found; int start_found;
struct extent_buffer *l; struct extent_buffer *l;
@@ -1433,14 +1434,17 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
/* for SSD, cluster allocations together as much as possible */ /* for SSD, cluster allocations together as much as possible */
if (btrfs_test_opt(root, SSD)) { if (btrfs_test_opt(root, SSD)) {
if (!data) { if (data)
if (root->fs_info->last_alloc) last_ptr = &root->fs_info->last_data_alloc;
hint_byte = root->fs_info->last_alloc; else
else { last_ptr = &root->fs_info->last_alloc;
hint_byte = hint_byte & if (*last_ptr) {
~((u64)BTRFS_BLOCK_GROUP_SIZE - 1); hint_byte = *last_ptr;
empty_size += 16 * 1024 * 1024; }
} else {
hint_byte = hint_byte &
~((u64)BTRFS_BLOCK_GROUP_SIZE - 1);
empty_size += 16 * 1024 * 1024;
} }
} }
@@ -1470,8 +1474,8 @@ check_failed:
search_start = find_search_start(root, &block_group, search_start, search_start = find_search_start(root, &block_group, search_start,
total_needed, data); total_needed, data);
if (!data && btrfs_test_opt(root, SSD) && info->last_alloc && if (btrfs_test_opt(root, SSD) && *last_ptr &&
search_start != info->last_alloc) { search_start != *last_ptr) {
info->last_alloc = 0; info->last_alloc = 0;
if (!empty_size) { if (!empty_size) {
empty_size += 16 * 1024 * 1024; empty_size += 16 * 1024 * 1024;
@@ -1609,6 +1613,8 @@ check_pending:
} }
ins->offset = num_bytes; ins->offset = num_bytes;
btrfs_free_path(path); btrfs_free_path(path);
if (btrfs_test_opt(root, SSD))
*last_ptr = ins->objectid + ins->offset;
return 0; return 0;
new_group: new_group:
@@ -1636,8 +1642,6 @@ enospc:
error: error:
btrfs_release_path(root, path); btrfs_release_path(root, path);
btrfs_free_path(path); btrfs_free_path(path);
if (btrfs_test_opt(root, SSD) && !ret && !data)
info->last_alloc = ins->objectid + ins->offset;
return ret; return ret;
} }
/* /*

1
fs/btrfs/transaction.c
View File

@@ -58,6 +58,7 @@ static int join_transaction(struct btrfs_root *root)
root->fs_info->generation++; root->fs_info->generation++;
root->fs_info->running_transaction = cur_trans; root->fs_info->running_transaction = cur_trans;
root->fs_info->last_alloc = 0; root->fs_info->last_alloc = 0;
root->fs_info->last_data_alloc = 0;
cur_trans->num_writers = 1; cur_trans->num_writers = 1;
cur_trans->num_joined = 0; cur_trans->num_joined = 0;
cur_trans->transid = root->fs_info->generation; cur_trans->transid = root->fs_info->generation;