summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-04-10 22:58:11 +0200
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-04-10 22:58:11 +0200
commit2619ba1f0ff9540a9d84683310a1e350b5efde3d (patch)
treeb027c1c51630d215fd40be34a72f7bc308b34652 /fs/btrfs/transaction.c
parentBtrfs: when forced to cow for file_write, get the page uptodate first (diff)
downloadlinux-2619ba1f0ff9540a9d84683310a1e350b5efde3d.tar.xz
linux-2619ba1f0ff9540a9d84683310a1e350b5efde3d.zip
Btrfs: subvolumes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r--fs/btrfs/transaction.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index f64c1729b0e1..e15a072407bf 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -64,7 +64,8 @@ struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
if (root != root->fs_info->tree_root && root->last_trans <
running_trans_id) {
radix_tree_tag_set(&root->fs_info->fs_roots_radix,
- (unsigned long)root, BTRFS_ROOT_TRANS_TAG);
+ (unsigned long)root->root_key.objectid,
+ BTRFS_ROOT_TRANS_TAG);
root->commit_root = root->node;
get_bh(root->node);
}
@@ -171,8 +172,9 @@ int add_dirty_roots(struct btrfs_trans_handle *trans,
break;
for (i = 0; i < ret; i++) {
root = gang[i];
- radix_tree_tag_clear(radix, (unsigned long)root,
- BTRFS_ROOT_TRANS_TAG);
+ radix_tree_tag_clear(radix,
+ (unsigned long)root->root_key.objectid,
+ BTRFS_ROOT_TRANS_TAG);
if (root->commit_root == root->node) {
WARN_ON(root->node->b_blocknr !=
btrfs_root_blocknr(&root->root_item));