Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297905
b: refs/heads/master
c: 103e976
h: refs/heads/master
i:
  297903: 882fc57
v: v3
  • Loading branch information
Jan Schmidt committed Mar 27, 2012
1 parent c72ef42 commit 8053c9b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e565d4b962948e70f37f417603caf131a773621b
refs/heads/master: 103e976616fe9c2a3e40764c979fa1a592274da2
6 changes: 4 additions & 2 deletions trunk/fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,8 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
BUG_ON(ret);

eb = btrfs_lock_root_node(fs_info->tree_root);
btrfs_cow_block(trans, fs_info->tree_root, eb, NULL, 0, &eb);
ret = btrfs_cow_block(trans, fs_info->tree_root, eb, NULL, 0, &eb);
BUG_ON(ret);
btrfs_tree_unlock(eb);
free_extent_buffer(eb);

Expand Down Expand Up @@ -949,7 +950,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
btrfs_set_root_flags(new_root_item, root_flags);

old = btrfs_lock_root_node(root);
btrfs_cow_block(trans, root, old, NULL, 0, &old);
ret = btrfs_cow_block(trans, root, old, NULL, 0, &old);
BUG_ON(ret);
btrfs_set_lock_blocking(old);

btrfs_copy_root(trans, root, old, &tmp, objectid);
Expand Down

0 comments on commit 8053c9b

Please sign in to comment.