dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Rework btrfs_drop_inode to avoid scheduling 

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2008-01-15 08:40:48 -05:00
parent 61295eb866
commit cee36a03e8
6 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/btrfs/ctree.h
View File

@ -349,6 +349,7 @@ struct btrfs_fs_info {
u64 total_pinned;
spinlock_t delalloc_lock;
spinlock_t new_trans_lock;
u64 delalloc_bytes;
};
/*

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

@ -639,6 +639,7 @@ struct btrfs_root *open_ctree(struct super_block *sb)
INIT_LIST_HEAD(&fs_info->hashers);
spin_lock_init(&fs_info->hash_lock);
spin_lock_init(&fs_info->delalloc_lock);
spin_lock_init(&fs_info->new_trans_lock);
memset(&fs_info->super_kobj, 0, sizeof(fs_info->super_kobj));
init_completion(&fs_info->kobj_unregister);

13
fs/btrfs/inode.c
View File

@ -993,20 +993,13 @@ fail:
void btrfs_drop_inode(struct inode *inode)
{
struct btrfs_trans_handle *trans;
struct btrfs_root *root = BTRFS_I(inode)->root;
if (!BTRFS_I(inode)->ordered_trans) {
if (!BTRFS_I(inode)->ordered_trans || inode->i_nlink) {
generic_drop_inode(inode);
return;
}
/* nasty, but it prevents a deadlock with data=ordered by preventing
* a commit until after this inode is done
*/
trans = btrfs_start_transaction(root, 1);
/* FIXME, make sure this delete actually ends up in the transaction */
btrfs_del_ordered_inode(inode);
generic_drop_inode(inode);
/* note, the inode is now untouchable */
btrfs_end_transaction(trans, root);
}
void btrfs_delete_inode(struct inode *inode)

36
fs/btrfs/ordered-data.c
View File

@ -219,3 +219,39 @@ int btrfs_find_del_first_ordered_inode(struct btrfs_ordered_inode_tree *tree,
kfree(entry);
return 1;
}
static int __btrfs_del_ordered_inode(struct btrfs_ordered_inode_tree *tree,
u64 root_objectid, u64 objectid)
{
struct tree_entry *entry;
struct rb_node *node;
struct rb_node *prev;
write_lock(&tree->lock);
node = __tree_search(&tree->tree, root_objectid, objectid, &prev);
if (!node) {
write_unlock(&tree->lock);
return 0;
}
rb_erase(node, &tree->tree);
write_unlock(&tree->lock);
entry = rb_entry(node, struct tree_entry, rb_node);
kfree(entry);
return 1;
}
int btrfs_del_ordered_inode(struct inode *inode)
{
struct btrfs_root *root = BTRFS_I(inode)->root;
u64 root_objectid = root->root_key.objectid;
spin_lock(&root->fs_info->new_trans_lock);
if (root->fs_info->running_transaction) {
struct btrfs_ordered_inode_tree *tree;
tree = &root->fs_info->running_transaction->ordered_inode_tree;
__btrfs_del_ordered_inode(tree, root_objectid, inode->i_ino);
}
spin_unlock(&root->fs_info->new_trans_lock);
return 0;
}

1
fs/btrfs/ordered-data.h
View File

@ -36,4 +36,5 @@ int btrfs_find_del_first_ordered_inode(struct btrfs_ordered_inode_tree *tree,
u64 *root_objectid, u64 *objectid);
int btrfs_find_first_ordered_inode(struct btrfs_ordered_inode_tree *tree,
u64 *root_objectid, u64 *objectid);
int btrfs_del_ordered_inode(struct inode *inode);
#endif

2
fs/btrfs/transaction.c
View File

@ -699,7 +699,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
BUG_ON(ret);
cur_trans = root->fs_info->running_transaction;
spin_lock(&root->fs_info->new_trans_lock);
root->fs_info->running_transaction = NULL;
spin_unlock(&root->fs_info->new_trans_lock);
btrfs_set_super_generation(&root->fs_info->super_copy,
cur_trans->transid);
btrfs_set_super_root(&root->fs_info->super_copy,