mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 05:11:32 +00:00
Btrfs: Optimize btree walking while logging inodes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
parent
49eb7e46d4
commit
3a5f1d458a
@ -1497,7 +1497,7 @@ struct btrfs_root *open_ctree(struct super_block *sb,
|
||||
* low idle thresh
|
||||
*/
|
||||
fs_info->endio_workers.idle_thresh = 4;
|
||||
fs_info->endio_write_workers.idle_thresh = 4;
|
||||
fs_info->endio_write_workers.idle_thresh = 64;
|
||||
|
||||
btrfs_start_workers(&fs_info->workers, 1);
|
||||
btrfs_start_workers(&fs_info->submit_workers, 1);
|
||||
|
@ -1982,7 +1982,6 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
||||
DEFINE_WAIT(wait);
|
||||
prepare_to_wait(&log->fs_info->tree_log_wait, &wait,
|
||||
TASK_UNINTERRUPTIBLE);
|
||||
batch = log->fs_info->tree_log_batch;
|
||||
mutex_unlock(&log->fs_info->tree_log_mutex);
|
||||
if (atomic_read(&log->fs_info->tree_log_writers))
|
||||
schedule();
|
||||
@ -2024,8 +2023,7 @@ out:
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* free all the extents used by the tree log. This should be called
|
||||
/* * free all the extents used by the tree log. This should be called
|
||||
* at commit time of the full transaction
|
||||
*/
|
||||
int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root)
|
||||
@ -2107,6 +2105,9 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
|
||||
int ret;
|
||||
int bytes_del = 0;
|
||||
|
||||
if (BTRFS_I(dir)->logged_trans < trans->transid)
|
||||
return 0;
|
||||
|
||||
ret = join_running_log_trans(root);
|
||||
if (ret)
|
||||
return 0;
|
||||
@ -2178,6 +2179,9 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
|
||||
u64 index;
|
||||
int ret;
|
||||
|
||||
if (BTRFS_I(inode)->logged_trans < trans->transid)
|
||||
return 0;
|
||||
|
||||
ret = join_running_log_trans(root);
|
||||
if (ret)
|
||||
return 0;
|
||||
@ -2484,6 +2488,7 @@ static int __btrfs_log_inode(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_inode_item *inode_item;
|
||||
u32 size;
|
||||
int ret;
|
||||
int nritems;
|
||||
|
||||
log = root->log_root;
|
||||
|
||||
@ -2541,12 +2546,11 @@ static int __btrfs_log_inode(struct btrfs_trans_handle *trans,
|
||||
path, 0, trans->transid);
|
||||
if (ret != 0)
|
||||
break;
|
||||
|
||||
again:
|
||||
if (min_key.objectid != inode->i_ino)
|
||||
break;
|
||||
if (min_key.type > max_key.type)
|
||||
break;
|
||||
|
||||
src = path->nodes[0];
|
||||
size = btrfs_item_size_nr(src, path->slots[0]);
|
||||
ret = btrfs_insert_empty_item(trans, log, dst_path, &min_key,
|
||||
@ -2606,9 +2610,17 @@ static int __btrfs_log_inode(struct btrfs_trans_handle *trans,
|
||||
}
|
||||
|
||||
btrfs_mark_buffer_dirty(dst_path->nodes[0]);
|
||||
btrfs_release_path(root, path);
|
||||
btrfs_release_path(log, dst_path);
|
||||
|
||||
nritems = btrfs_header_nritems(path->nodes[0]);
|
||||
path->slots[0]++;
|
||||
if (path->slots[0] < nritems) {
|
||||
btrfs_item_key_to_cpu(path->nodes[0], &min_key,
|
||||
path->slots[0]);
|
||||
goto again;
|
||||
}
|
||||
btrfs_release_path(root, path);
|
||||
|
||||
if (min_key.offset < (u64)-1)
|
||||
min_key.offset++;
|
||||
else if (min_key.type < (u8)-1)
|
||||
@ -2626,6 +2638,7 @@ static int __btrfs_log_inode(struct btrfs_trans_handle *trans,
|
||||
ret = log_directory_changes(trans, root, inode, path, dst_path);
|
||||
BUG_ON(ret);
|
||||
}
|
||||
BTRFS_I(inode)->logged_trans = trans->transid;
|
||||
mutex_unlock(&BTRFS_I(inode)->log_mutex);
|
||||
|
||||
btrfs_free_path(path);
|
||||
|
Loading…
Reference in New Issue
Block a user