Skip to content

Commit

Permalink
Btrfs: make sure btrfs_update_delayed_ref doesn't increase ref_mod
Browse files Browse the repository at this point in the history
btrfs_update_delayed_ref is optimized to add and remove different
references in one pass through the delayed ref tree.  It is a zero
sum on the total number of refs on a given extent.

But, the code was recording an extra ref in the head node.  This
never made it down to the disk but was used when deciding if it was
safe to free the extent while dropping snapshots.

The fix used here is to make sure the ref_mod count is unchanged
on the head ref when btrfs_update_delayed_ref is called.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Chris Mason committed Mar 25, 2009
1 parent af4176b commit 1a81af4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
10 changes: 7 additions & 3 deletions fs/btrfs/delayed-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,12 @@ static noinline int __btrfs_add_delayed_ref(struct btrfs_trans_handle *trans,
* the head node stores the sum of all the mods, so dropping a ref
* should drop the sum in the head node by one.
*/
if (parent == (u64)-1 && action == BTRFS_DROP_DELAYED_REF)
count_mod = -1;
if (parent == (u64)-1) {
if (action == BTRFS_DROP_DELAYED_REF)
count_mod = -1;
else if (action == BTRFS_UPDATE_DELAYED_HEAD)
count_mod = 0;
}

/*
* BTRFS_ADD_DELAYED_EXTENT means that we need to update
Expand Down Expand Up @@ -647,7 +651,7 @@ int btrfs_update_delayed_ref(struct btrfs_trans_handle *trans,
*/
ret = __btrfs_add_delayed_ref(trans, &head_ref->node, bytenr, num_bytes,
(u64)-1, 0, 0, 0,
BTRFS_ADD_DELAYED_REF, 0);
BTRFS_UPDATE_DELAYED_HEAD, 0);
BUG_ON(ret);

ret = __btrfs_add_delayed_ref(trans, &ref->node, bytenr, num_bytes,
Expand Down
1 change: 1 addition & 0 deletions fs/btrfs/delayed-ref.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */
#define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */
#define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */
#define BTRFS_UPDATE_DELAYED_HEAD 4 /* not changing ref count on head ref */

struct btrfs_delayed_ref_node {
struct rb_node rb_node;
Expand Down

0 comments on commit 1a81af4

Please sign in to comment.