summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ordered-data.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-01-15 08:40:48 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:59 -0400
commitcee36a03e8f7c6e14aefd497d3acf01bcd3ef153 (patch)
tree14195245463be27ab4314da6eb943b146e6c8591 /fs/btrfs/ordered-data.c
parent61295eb8665e723e77af91d0a1e655a4bd28344f (diff)
downloadlinux-cee36a03e8f7c6e14aefd497d3acf01bcd3ef153.tar.gz
linux-cee36a03e8f7c6e14aefd497d3acf01bcd3ef153.tar.bz2
linux-cee36a03e8f7c6e14aefd497d3acf01bcd3ef153.zip
Rework btrfs_drop_inode to avoid scheduling
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ordered-data.c')
-rw-r--r--fs/btrfs/ordered-data.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 411aba84d305..b56011baa17c 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -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;
+}
+