Commit 199c2a9c authored by Miao Xie's avatar Miao Xie Committed by Josef Bacik

Btrfs: introduce per-subvolume ordered extent list

The reason we introduce per-subvolume ordered extent list is the same
as the per-subvolume delalloc inode list.
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent eb73c1b7
...@@ -1437,17 +1437,18 @@ struct btrfs_fs_info { ...@@ -1437,17 +1437,18 @@ struct btrfs_fs_info {
atomic_t open_ioctl_trans; atomic_t open_ioctl_trans;
/* /*
* this is used by the balancing code to wait for all the pending * this is used to protect the following list -- ordered_roots.
* ordered extents
*/ */
spinlock_t ordered_extent_lock; spinlock_t ordered_root_lock;
/* /*
* all of the data=ordered extents pending writeback * all fs/file tree roots in which there are data=ordered extents
* pending writeback are added into this list.
*
* these can span multiple transactions and basically include * these can span multiple transactions and basically include
* every dirty data page that isn't from nodatacow * every dirty data page that isn't from nodatacow
*/ */
struct list_head ordered_extents; struct list_head ordered_roots;
spinlock_t delalloc_root_lock; spinlock_t delalloc_root_lock;
/* all fs/file tree roots that have delalloc inodes. */ /* all fs/file tree roots that have delalloc inodes. */
...@@ -1753,6 +1754,20 @@ struct btrfs_root { ...@@ -1753,6 +1754,20 @@ struct btrfs_root {
struct list_head delalloc_inodes; struct list_head delalloc_inodes;
struct list_head delalloc_root; struct list_head delalloc_root;
u64 nr_delalloc_inodes; u64 nr_delalloc_inodes;
/*
* this is used by the balancing code to wait for all the pending
* ordered extents
*/
spinlock_t ordered_extent_lock;
/*
* all of the data=ordered extents pending writeback
* these can span multiple transactions and basically include
* every dirty data page that isn't from nodatacow
*/
struct list_head ordered_extents;
struct list_head ordered_root;
u64 nr_ordered_extents;
}; };
struct btrfs_ioctl_defrag_range_args { struct btrfs_ioctl_defrag_range_args {
......
...@@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, ...@@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR; args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
btrfs_dev_replace_unlock(dev_replace); btrfs_dev_replace_unlock(dev_replace);
btrfs_wait_ordered_extents(root, 0); btrfs_wait_all_ordered_extents(root->fs_info, 0);
/* force writing the updated state information to disk */ /* force writing the updated state information to disk */
trans = btrfs_start_transaction(root, 0); trans = btrfs_start_transaction(root, 0);
...@@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, ...@@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
return ret; return ret;
} }
btrfs_wait_ordered_extents(root, 0); btrfs_wait_all_ordered_extents(root->fs_info, 0);
trans = btrfs_start_transaction(root, 0); trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
......
...@@ -1192,6 +1192,7 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, ...@@ -1192,6 +1192,7 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
root->last_trans = 0; root->last_trans = 0;
root->highest_objectid = 0; root->highest_objectid = 0;
root->nr_delalloc_inodes = 0; root->nr_delalloc_inodes = 0;
root->nr_ordered_extents = 0;
root->name = NULL; root->name = NULL;
root->inode_tree = RB_ROOT; root->inode_tree = RB_ROOT;
INIT_RADIX_TREE(&root->delayed_nodes_tree, GFP_ATOMIC); INIT_RADIX_TREE(&root->delayed_nodes_tree, GFP_ATOMIC);
...@@ -1202,11 +1203,14 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, ...@@ -1202,11 +1203,14 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
INIT_LIST_HEAD(&root->root_list); INIT_LIST_HEAD(&root->root_list);
INIT_LIST_HEAD(&root->delalloc_inodes); INIT_LIST_HEAD(&root->delalloc_inodes);
INIT_LIST_HEAD(&root->delalloc_root); INIT_LIST_HEAD(&root->delalloc_root);
INIT_LIST_HEAD(&root->ordered_extents);
INIT_LIST_HEAD(&root->ordered_root);
INIT_LIST_HEAD(&root->logged_list[0]); INIT_LIST_HEAD(&root->logged_list[0]);
INIT_LIST_HEAD(&root->logged_list[1]); INIT_LIST_HEAD(&root->logged_list[1]);
spin_lock_init(&root->orphan_lock); spin_lock_init(&root->orphan_lock);
spin_lock_init(&root->inode_lock); spin_lock_init(&root->inode_lock);
spin_lock_init(&root->delalloc_lock); spin_lock_init(&root->delalloc_lock);
spin_lock_init(&root->ordered_extent_lock);
spin_lock_init(&root->accounting_lock); spin_lock_init(&root->accounting_lock);
spin_lock_init(&root->log_extents_lock[0]); spin_lock_init(&root->log_extents_lock[0]);
spin_lock_init(&root->log_extents_lock[1]); spin_lock_init(&root->log_extents_lock[1]);
...@@ -2193,8 +2197,8 @@ int open_ctree(struct super_block *sb, ...@@ -2193,8 +2197,8 @@ int open_ctree(struct super_block *sb,
fs_info->thread_pool_size = min_t(unsigned long, fs_info->thread_pool_size = min_t(unsigned long,
num_online_cpus() + 2, 8); num_online_cpus() + 2, 8);
INIT_LIST_HEAD(&fs_info->ordered_extents); INIT_LIST_HEAD(&fs_info->ordered_roots);
spin_lock_init(&fs_info->ordered_extent_lock); spin_lock_init(&fs_info->ordered_root_lock);
fs_info->delayed_root = kmalloc(sizeof(struct btrfs_delayed_root), fs_info->delayed_root = kmalloc(sizeof(struct btrfs_delayed_root),
GFP_NOFS); GFP_NOFS);
if (!fs_info->delayed_root) { if (!fs_info->delayed_root) {
...@@ -3683,7 +3687,7 @@ static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t, ...@@ -3683,7 +3687,7 @@ static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t,
INIT_LIST_HEAD(&splice); INIT_LIST_HEAD(&splice);
mutex_lock(&root->fs_info->ordered_operations_mutex); mutex_lock(&root->fs_info->ordered_operations_mutex);
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
list_splice_init(&t->ordered_operations, &splice); list_splice_init(&t->ordered_operations, &splice);
while (!list_empty(&splice)) { while (!list_empty(&splice)) {
...@@ -3691,14 +3695,14 @@ static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t, ...@@ -3691,14 +3695,14 @@ static void btrfs_destroy_ordered_operations(struct btrfs_transaction *t,
ordered_operations); ordered_operations);
list_del_init(&btrfs_inode->ordered_operations); list_del_init(&btrfs_inode->ordered_operations);
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
btrfs_invalidate_inodes(btrfs_inode->root); btrfs_invalidate_inodes(btrfs_inode->root);
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
} }
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
mutex_unlock(&root->fs_info->ordered_operations_mutex); mutex_unlock(&root->fs_info->ordered_operations_mutex);
} }
...@@ -3706,15 +3710,36 @@ static void btrfs_destroy_ordered_extents(struct btrfs_root *root) ...@@ -3706,15 +3710,36 @@ static void btrfs_destroy_ordered_extents(struct btrfs_root *root)
{ {
struct btrfs_ordered_extent *ordered; struct btrfs_ordered_extent *ordered;
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->ordered_extent_lock);
/* /*
* This will just short circuit the ordered completion stuff which will * This will just short circuit the ordered completion stuff which will
* make sure the ordered extent gets properly cleaned up. * make sure the ordered extent gets properly cleaned up.
*/ */
list_for_each_entry(ordered, &root->fs_info->ordered_extents, list_for_each_entry(ordered, &root->ordered_extents,
root_extent_list) root_extent_list)
set_bit(BTRFS_ORDERED_IOERR, &ordered->flags); set_bit(BTRFS_ORDERED_IOERR, &ordered->flags);
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->ordered_extent_lock);
}
static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
{
struct btrfs_root *root;
struct list_head splice;
INIT_LIST_HEAD(&splice);
spin_lock(&fs_info->ordered_root_lock);
list_splice_init(&fs_info->ordered_roots, &splice);
while (!list_empty(&splice)) {
root = list_first_entry(&splice, struct btrfs_root,
ordered_root);
list_del_init(&root->ordered_root);
btrfs_destroy_ordered_extents(root);
cond_resched_lock(&fs_info->ordered_root_lock);
}
spin_unlock(&fs_info->ordered_root_lock);
} }
int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans, int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
...@@ -3977,7 +4002,7 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root) ...@@ -3977,7 +4002,7 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root)
btrfs_destroy_ordered_operations(t, root); btrfs_destroy_ordered_operations(t, root);
btrfs_destroy_ordered_extents(root); btrfs_destroy_all_ordered_extents(root->fs_info);
btrfs_destroy_delayed_refs(t, root); btrfs_destroy_delayed_refs(t, root);
......
...@@ -3901,7 +3901,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root, ...@@ -3901,7 +3901,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root,
*/ */
btrfs_start_all_delalloc_inodes(root->fs_info, 0); btrfs_start_all_delalloc_inodes(root->fs_info, 0);
if (!current->journal_info) if (!current->journal_info)
btrfs_wait_ordered_extents(root, 0); btrfs_wait_all_ordered_extents(root->fs_info, 0);
} }
} }
...@@ -3931,7 +3931,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, ...@@ -3931,7 +3931,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
if (delalloc_bytes == 0) { if (delalloc_bytes == 0) {
if (trans) if (trans)
return; return;
btrfs_wait_ordered_extents(root, 0); btrfs_wait_all_ordered_extents(root->fs_info, 0);
return; return;
} }
...@@ -3959,7 +3959,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, ...@@ -3959,7 +3959,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
loops++; loops++;
if (wait_ordered && !trans) { if (wait_ordered && !trans) {
btrfs_wait_ordered_extents(root, 0); btrfs_wait_all_ordered_extents(root->fs_info, 0);
} else { } else {
time_left = schedule_timeout_killable(1); time_left = schedule_timeout_killable(1);
if (time_left) if (time_left)
......
...@@ -7991,9 +7991,9 @@ void btrfs_destroy_inode(struct inode *inode) ...@@ -7991,9 +7991,9 @@ void btrfs_destroy_inode(struct inode *inode)
*/ */
smp_mb(); smp_mb();
if (!list_empty(&BTRFS_I(inode)->ordered_operations)) { if (!list_empty(&BTRFS_I(inode)->ordered_operations)) {
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
list_del_init(&BTRFS_I(inode)->ordered_operations); list_del_init(&BTRFS_I(inode)->ordered_operations);
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
} }
if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "transaction.h" #include "transaction.h"
#include "btrfs_inode.h" #include "btrfs_inode.h"
#include "extent_io.h" #include "extent_io.h"
#include "disk-io.h"
static struct kmem_cache *btrfs_ordered_extent_cache; static struct kmem_cache *btrfs_ordered_extent_cache;
...@@ -184,6 +185,7 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset, ...@@ -184,6 +185,7 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
u64 start, u64 len, u64 disk_len, u64 start, u64 len, u64 disk_len,
int type, int dio, int compress_type) int type, int dio, int compress_type)
{ {
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_ordered_inode_tree *tree; struct btrfs_ordered_inode_tree *tree;
struct rb_node *node; struct rb_node *node;
struct btrfs_ordered_extent *entry; struct btrfs_ordered_extent *entry;
...@@ -227,10 +229,18 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset, ...@@ -227,10 +229,18 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
ordered_data_tree_panic(inode, -EEXIST, file_offset); ordered_data_tree_panic(inode, -EEXIST, file_offset);
spin_unlock_irq(&tree->lock); spin_unlock_irq(&tree->lock);
spin_lock(&BTRFS_I(inode)->root->fs_info->ordered_extent_lock); spin_lock(&root->ordered_extent_lock);
list_add_tail(&entry->root_extent_list, list_add_tail(&entry->root_extent_list,
&BTRFS_I(inode)->root->fs_info->ordered_extents); &root->ordered_extents);
spin_unlock(&BTRFS_I(inode)->root->fs_info->ordered_extent_lock); root->nr_ordered_extents++;
if (root->nr_ordered_extents == 1) {
spin_lock(&root->fs_info->ordered_root_lock);
BUG_ON(!list_empty(&root->ordered_root));
list_add_tail(&root->ordered_root,
&root->fs_info->ordered_roots);
spin_unlock(&root->fs_info->ordered_root_lock);
}
spin_unlock(&root->ordered_extent_lock);
return 0; return 0;
} }
...@@ -516,8 +526,9 @@ void btrfs_remove_ordered_extent(struct inode *inode, ...@@ -516,8 +526,9 @@ void btrfs_remove_ordered_extent(struct inode *inode,
set_bit(BTRFS_ORDERED_COMPLETE, &entry->flags); set_bit(BTRFS_ORDERED_COMPLETE, &entry->flags);
spin_unlock_irq(&tree->lock); spin_unlock_irq(&tree->lock);
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->ordered_extent_lock);
list_del_init(&entry->root_extent_list); list_del_init(&entry->root_extent_list);
root->nr_ordered_extents--;
trace_btrfs_ordered_extent_remove(inode, entry); trace_btrfs_ordered_extent_remove(inode, entry);
...@@ -530,7 +541,14 @@ void btrfs_remove_ordered_extent(struct inode *inode, ...@@ -530,7 +541,14 @@ void btrfs_remove_ordered_extent(struct inode *inode,
!mapping_tagged(inode->i_mapping, PAGECACHE_TAG_DIRTY)) { !mapping_tagged(inode->i_mapping, PAGECACHE_TAG_DIRTY)) {
list_del_init(&BTRFS_I(inode)->ordered_operations); list_del_init(&BTRFS_I(inode)->ordered_operations);
} }
spin_unlock(&root->fs_info->ordered_extent_lock);
if (!root->nr_ordered_extents) {
spin_lock(&root->fs_info->ordered_root_lock);
BUG_ON(list_empty(&root->ordered_root));
list_del_init(&root->ordered_root);
spin_unlock(&root->fs_info->ordered_root_lock);
}
spin_unlock(&root->ordered_extent_lock);
wake_up(&entry->wait); wake_up(&entry->wait);
} }
...@@ -550,7 +568,6 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work) ...@@ -550,7 +568,6 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work)
void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput) void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
{ {
struct list_head splice, works; struct list_head splice, works;
struct list_head *cur;
struct btrfs_ordered_extent *ordered, *next; struct btrfs_ordered_extent *ordered, *next;
struct inode *inode; struct inode *inode;
...@@ -558,35 +575,34 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput) ...@@ -558,35 +575,34 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
INIT_LIST_HEAD(&works); INIT_LIST_HEAD(&works);
mutex_lock(&root->fs_info->ordered_operations_mutex); mutex_lock(&root->fs_info->ordered_operations_mutex);
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->ordered_extent_lock);
list_splice_init(&root->fs_info->ordered_extents, &splice); list_splice_init(&root->ordered_extents, &splice);
while (!list_empty(&splice)) { while (!list_empty(&splice)) {
cur = splice.next; ordered = list_first_entry(&splice, struct btrfs_ordered_extent,
ordered = list_entry(cur, struct btrfs_ordered_extent,
root_extent_list); root_extent_list);
list_del_init(&ordered->root_extent_list); list_move_tail(&ordered->root_extent_list,
atomic_inc(&ordered->refs); &root->ordered_extents);
/* /*
* the inode may be getting freed (in sys_unlink path). * the inode may be getting freed (in sys_unlink path).
*/ */
inode = igrab(ordered->inode); inode = igrab(ordered->inode);
if (!inode) {
cond_resched_lock(&root->ordered_extent_lock);
continue;
}
spin_unlock(&root->fs_info->ordered_extent_lock); atomic_inc(&ordered->refs);
spin_unlock(&root->ordered_extent_lock);
if (inode) {
ordered->flush_work.func = btrfs_run_ordered_extent_work; ordered->flush_work.func = btrfs_run_ordered_extent_work;
list_add_tail(&ordered->work_list, &works); list_add_tail(&ordered->work_list, &works);
btrfs_queue_worker(&root->fs_info->flush_workers, btrfs_queue_worker(&root->fs_info->flush_workers,
&ordered->flush_work); &ordered->flush_work);
} else {
btrfs_put_ordered_extent(ordered);
}
cond_resched(); cond_resched();
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->ordered_extent_lock);
} }
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->ordered_extent_lock);
list_for_each_entry_safe(ordered, next, &works, work_list) { list_for_each_entry_safe(ordered, next, &works, work_list) {
list_del_init(&ordered->work_list); list_del_init(&ordered->work_list);
...@@ -604,6 +620,33 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput) ...@@ -604,6 +620,33 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
mutex_unlock(&root->fs_info->ordered_operations_mutex); mutex_unlock(&root->fs_info->ordered_operations_mutex);
} }
void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,
int delay_iput)
{
struct btrfs_root *root;
struct list_head splice;
INIT_LIST_HEAD(&splice);
spin_lock(&fs_info->ordered_root_lock);
list_splice_init(&fs_info->ordered_roots, &splice);
while (!list_empty(&splice)) {
root = list_first_entry(&splice, struct btrfs_root,
ordered_root);
root = btrfs_grab_fs_root(root);
BUG_ON(!root);
list_move_tail(&root->ordered_root,
&fs_info->ordered_roots);
spin_unlock(&fs_info->ordered_root_lock);
btrfs_wait_ordered_extents(root, delay_iput);
btrfs_put_fs_root(root);
spin_lock(&fs_info->ordered_root_lock);
}
spin_unlock(&fs_info->ordered_root_lock);
}
/* /*
* this is used during transaction commit to write all the inodes * this is used during transaction commit to write all the inodes
* added to the ordered operation list. These files must be fully on * added to the ordered operation list. These files must be fully on
...@@ -629,7 +672,7 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans, ...@@ -629,7 +672,7 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans,
INIT_LIST_HEAD(&works); INIT_LIST_HEAD(&works);
mutex_lock(&root->fs_info->ordered_operations_mutex); mutex_lock(&root->fs_info->ordered_operations_mutex);
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
list_splice_init(&cur_trans->ordered_operations, &splice); list_splice_init(&cur_trans->ordered_operations, &splice);
while (!list_empty(&splice)) { while (!list_empty(&splice)) {
btrfs_inode = list_entry(splice.next, struct btrfs_inode, btrfs_inode = list_entry(splice.next, struct btrfs_inode,
...@@ -648,17 +691,17 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans, ...@@ -648,17 +691,17 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans,
if (!wait) if (!wait)
list_add_tail(&BTRFS_I(inode)->ordered_operations, list_add_tail(&BTRFS_I(inode)->ordered_operations,
&cur_trans->ordered_operations); &cur_trans->ordered_operations);
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
work = btrfs_alloc_delalloc_work(inode, wait, 1); work = btrfs_alloc_delalloc_work(inode, wait, 1);
if (!work) { if (!work) {
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
if (list_empty(&BTRFS_I(inode)->ordered_operations)) if (list_empty(&BTRFS_I(inode)->ordered_operations))
list_add_tail(&btrfs_inode->ordered_operations, list_add_tail(&btrfs_inode->ordered_operations,
&splice); &splice);
list_splice_tail(&splice, list_splice_tail(&splice,
&cur_trans->ordered_operations); &cur_trans->ordered_operations);
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
...@@ -667,9 +710,9 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans, ...@@ -667,9 +710,9 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans,
&work->work); &work->work);
cond_resched(); cond_resched();
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
} }
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
out: out:
list_for_each_entry_safe(work, next, &works, list) { list_for_each_entry_safe(work, next, &works, list) {
list_del_init(&work->list); list_del_init(&work->list);
...@@ -1055,12 +1098,12 @@ void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans, ...@@ -1055,12 +1098,12 @@ void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,
if (last_mod < root->fs_info->last_trans_committed) if (last_mod < root->fs_info->last_trans_committed)
return; return;
spin_lock(&root->fs_info->ordered_extent_lock); spin_lock(&root->fs_info->ordered_root_lock);
if (list_empty(&BTRFS_I(inode)->ordered_operations)) { if (list_empty(&BTRFS_I(inode)->ordered_operations)) {
list_add_tail(&BTRFS_I(inode)->ordered_operations, list_add_tail(&BTRFS_I(inode)->ordered_operations,
&cur_trans->ordered_operations); &cur_trans->ordered_operations);
} }
spin_unlock(&root->fs_info->ordered_extent_lock); spin_unlock(&root->fs_info->ordered_root_lock);
} }
int __init ordered_data_init(void) int __init ordered_data_init(void)
......
...@@ -204,6 +204,8 @@ void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans, ...@@ -204,6 +204,8 @@ void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct inode *inode); struct inode *inode);
void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput); void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput);
void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,
int delay_iput);
void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode); void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode);
void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid); void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid);
void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid); void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid);
......
...@@ -4164,7 +4164,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) ...@@ -4164,7 +4164,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)
err = ret; err = ret;
goto out; goto out;
} }
btrfs_wait_ordered_extents(fs_info->tree_root, 0); btrfs_wait_all_ordered_extents(fs_info, 0);
while (1) { while (1) {
mutex_lock(&fs_info->cleaner_mutex); mutex_lock(&fs_info->cleaner_mutex);
......
...@@ -862,7 +862,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait) ...@@ -862,7 +862,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
return 0; return 0;
} }
btrfs_wait_ordered_extents(root, 1); btrfs_wait_all_ordered_extents(fs_info, 0);
trans = btrfs_attach_transaction_barrier(root); trans = btrfs_attach_transaction_barrier(root);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
......
...@@ -1505,7 +1505,7 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans, ...@@ -1505,7 +1505,7 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans,
ret = btrfs_start_all_delalloc_inodes(root->fs_info, 1); ret = btrfs_start_all_delalloc_inodes(root->fs_info, 1);
if (ret) if (ret)
return ret; return ret;
btrfs_wait_ordered_extents(root, 1); btrfs_wait_all_ordered_extents(root->fs_info, 1);
} }
ret = btrfs_run_delayed_items(trans, root); ret = btrfs_run_delayed_items(trans, root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment