Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66d7e7f0 authored by Arne Jansen's avatar Arne Jansen Committed by Jan Schmidt
Browse files

Btrfs: mark delayed refs as for cow 



Add a for_cow parameter to add_delayed_*_ref and pass the appropriate value
from every call site. The for_cow parameter will later on be used to
determine if a ref will change anything with respect to qgroups.

Delayed refs coming from relocation are always counted as for_cow, as they
don't change subvol quota.

Also pass in the fs_info for later use.

btrfs_find_all_roots() will use this as an optimization, as changes that are
for_cow will not change anything with respect to which root points to a
certain leaf. Thus, we don't need to add the current sequence number to
those delayed refs.

Signed-off-by: default avatarArne Jansen <sensille@gmx.net>
Signed-off-by: default avatarJan Schmidt <list.btrfs@jan-o-sch.net>
parent c7d22a3c

fs/btrfs/ctree.c

+21 −21
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 


	cow = btrfs_alloc_free_block(trans, root, buf->len, 0,

				     new_root_objectid, &disk_key, level,

				     buf->start, 0);

				     buf->start, 0, 1);

	if (IS_ERR(cow))

		return PTR_ERR(cow);
@@ -261,9 +261,9 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 


	WARN_ON(btrfs_header_generation(buf) > trans->transid);

	if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID)

		ret = btrfs_inc_ref(trans, root, cow, 1);

		ret = btrfs_inc_ref(trans, root, cow, 1, 1);

	else

		ret = btrfs_inc_ref(trans, root, cow, 0);

		ret = btrfs_inc_ref(trans, root, cow, 0, 1);



	if (ret)

		return ret;
@@ -350,14 +350,14 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
		if ((owner == root->root_key.objectid ||

		     root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &&

		    !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)) {

			ret = btrfs_inc_ref(trans, root, buf, 1);

			ret = btrfs_inc_ref(trans, root, buf, 1, 1);

			BUG_ON(ret);



			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID) {

				ret = btrfs_dec_ref(trans, root, buf, 0);

				ret = btrfs_dec_ref(trans, root, buf, 0, 1);

				BUG_ON(ret);

				ret = btrfs_inc_ref(trans, root, cow, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1, 1);

				BUG_ON(ret);

			}

			new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;
@@ -365,9 +365,9 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 


			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID)

				ret = btrfs_inc_ref(trans, root, cow, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0);

				ret = btrfs_inc_ref(trans, root, cow, 0, 1);

			BUG_ON(ret);

		}

		if (new_flags != 0) {
@@ -381,11 +381,11 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
		if (flags & BTRFS_BLOCK_FLAG_FULL_BACKREF) {

			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID)

				ret = btrfs_inc_ref(trans, root, cow, 1);

				ret = btrfs_inc_ref(trans, root, cow, 1, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0);

				ret = btrfs_inc_ref(trans, root, cow, 0, 1);

			BUG_ON(ret);

			ret = btrfs_dec_ref(trans, root, buf, 1);

			ret = btrfs_dec_ref(trans, root, buf, 1, 1);

			BUG_ON(ret);

		}

		clean_tree_block(trans, root, buf);
@@ -446,7 +446,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 


	cow = btrfs_alloc_free_block(trans, root, buf->len, parent_start,

				     root->root_key.objectid, &disk_key,

				     level, search_start, empty_size);

				     level, search_start, empty_size, 1);

	if (IS_ERR(cow))

		return PTR_ERR(cow);
@@ -484,7 +484,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
		rcu_assign_pointer(root->node, cow);



		btrfs_free_tree_block(trans, root, buf, parent_start,

				      last_ref);

				      last_ref, 1);

		free_extent_buffer(buf);

		add_root_to_dirty_list(root);

	} else {
@@ -500,7 +500,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
					      trans->transid);

		btrfs_mark_buffer_dirty(parent);

		btrfs_free_tree_block(trans, root, buf, parent_start,

				      last_ref);

				      last_ref, 1);

	}

	if (unlock_orig)

		btrfs_tree_unlock(buf);
@@ -957,7 +957,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		free_extent_buffer(mid);



		root_sub_used(root, mid->len);

		btrfs_free_tree_block(trans, root, mid, 0, 1);

		btrfs_free_tree_block(trans, root, mid, 0, 1, 0);

		/* once for the root ptr */

		free_extent_buffer(mid);

		return 0;
@@ -1015,7 +1015,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
			if (wret)

				ret = wret;

			root_sub_used(root, right->len);

			btrfs_free_tree_block(trans, root, right, 0, 1);

			btrfs_free_tree_block(trans, root, right, 0, 1, 0);

			free_extent_buffer(right);

			right = NULL;

		} else {
@@ -1055,7 +1055,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		if (wret)

			ret = wret;

		root_sub_used(root, mid->len);

		btrfs_free_tree_block(trans, root, mid, 0, 1);

		btrfs_free_tree_block(trans, root, mid, 0, 1, 0);

		free_extent_buffer(mid);

		mid = NULL;

	} else {
@@ -2089,7 +2089,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 


	c = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

				   root->root_key.objectid, &lower_key,

				   level, root->node->start, 0);

				   level, root->node->start, 0, 0);

	if (IS_ERR(c))

		return PTR_ERR(c);
@@ -2216,7 +2216,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, 


	split = btrfs_alloc_free_block(trans, root, root->nodesize, 0,

					root->root_key.objectid,

					&disk_key, level, c->start, 0);

					&disk_key, level, c->start, 0, 0);

	if (IS_ERR(split))

		return PTR_ERR(split);
@@ -2970,7 +2970,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 


	right = btrfs_alloc_free_block(trans, root, root->leafsize, 0,

					root->root_key.objectid,

					&disk_key, 0, l->start, 0);

					&disk_key, 0, l->start, 0, 0);

	if (IS_ERR(right))

		return PTR_ERR(right);
@@ -3781,7 +3781,7 @@ static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans, 


	root_sub_used(root, leaf->len);



	btrfs_free_tree_block(trans, root, leaf, 0, 1);

	btrfs_free_tree_block(trans, root, leaf, 0, 1, 0);

	return 0;

}

/*

fs/btrfs/ctree.h

+9 −8
Original line number Diff line number Diff line
@@ -2277,11 +2277,11 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, 
					struct btrfs_root *root, u32 blocksize,

					u64 parent, u64 root_objectid,

					struct btrfs_disk_key *key, int level,

					u64 hint, u64 empty_size);

					u64 hint, u64 empty_size, int for_cow);

void btrfs_free_tree_block(struct btrfs_trans_handle *trans,

			   struct btrfs_root *root,

			   struct extent_buffer *buf,

			   u64 parent, int last_ref);

			   u64 parent, int last_ref, int for_cow);

struct extent_buffer *btrfs_init_new_buffer(struct btrfs_trans_handle *trans,

					    struct btrfs_root *root,

					    u64 bytenr, u32 blocksize,
@@ -2301,17 +2301,17 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans, 
				  u64 search_end, struct btrfs_key *ins,

				  u64 data);

int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		  struct extent_buffer *buf, int full_backref);

		  struct extent_buffer *buf, int full_backref, int for_cow);

int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		  struct extent_buffer *buf, int full_backref);

		  struct extent_buffer *buf, int full_backref, int for_cow);

int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

				u64 bytenr, u64 num_bytes, u64 flags,

				int is_data);

int btrfs_free_extent(struct btrfs_trans_handle *trans,

		      struct btrfs_root *root,

		      u64 bytenr, u64 num_bytes, u64 parent,

		      u64 root_objectid, u64 owner, u64 offset);

		      u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid,

		      u64 owner, u64 offset, int for_cow);



int btrfs_free_reserved_extent(struct btrfs_root *root, u64 start, u64 len);

int btrfs_free_and_pin_reserved_extent(struct btrfs_root *root,
@@ -2323,7 +2323,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, 
int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,

			 struct btrfs_root *root,

			 u64 bytenr, u64 num_bytes, u64 parent,

			 u64 root_objectid, u64 owner, u64 offset);

			 u64 root_objectid, u64 owner, u64 offset, int for_cow);



int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,

				    struct btrfs_root *root);
@@ -2492,7 +2492,8 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) 
int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path);

int btrfs_leaf_free_space(struct btrfs_root *root, struct extent_buffer *leaf);

void btrfs_drop_snapshot(struct btrfs_root *root,

			 struct btrfs_block_rsv *block_rsv, int update_ref);

			 struct btrfs_block_rsv *block_rsv, int update_ref,

			 int for_reloc);

int btrfs_drop_subtree(struct btrfs_trans_handle *trans,

			struct btrfs_root *root,

			struct extent_buffer *node,

fs/btrfs/delayed-ref.c

+31 −19
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ update_existing_head_ref(struct btrfs_delayed_ref_node *existing, 
 * this does all the dirty work in terms of maintaining the correct

 * overall modification count.

 */

static noinline int add_delayed_ref_head(struct btrfs_trans_handle *trans,

static noinline int add_delayed_ref_head(struct btrfs_fs_info *fs_info,

					struct btrfs_trans_handle *trans,

					struct btrfs_delayed_ref_node *ref,

					u64 bytenr, u64 num_bytes,

					int action, int is_data)
@@ -468,10 +469,12 @@ static noinline int add_delayed_ref_head(struct btrfs_trans_handle *trans, 
/*

 * helper to insert a delayed tree ref into the rbtree.

 */

static noinline int add_delayed_tree_ref(struct btrfs_trans_handle *trans,

static noinline int add_delayed_tree_ref(struct btrfs_fs_info *fs_info,

					 struct btrfs_trans_handle *trans,

					 struct btrfs_delayed_ref_node *ref,

					 u64 bytenr, u64 num_bytes, u64 parent,

					 u64 ref_root, int level, int action)

					 u64 ref_root, int level, int action,

					 int for_cow)

{

	struct btrfs_delayed_ref_node *existing;

	struct btrfs_delayed_tree_ref *full_ref;
@@ -522,11 +525,12 @@ static noinline int add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
/*

 * helper to insert a delayed data ref into the rbtree.

 */

static noinline int add_delayed_data_ref(struct btrfs_trans_handle *trans,

static noinline int add_delayed_data_ref(struct btrfs_fs_info *fs_info,

					 struct btrfs_trans_handle *trans,

					 struct btrfs_delayed_ref_node *ref,

					 u64 bytenr, u64 num_bytes, u64 parent,

					 u64 ref_root, u64 owner, u64 offset,

					 int action)

					 int action, int for_cow)

{

	struct btrfs_delayed_ref_node *existing;

	struct btrfs_delayed_data_ref *full_ref;
@@ -554,6 +558,7 @@ static noinline int add_delayed_data_ref(struct btrfs_trans_handle *trans, 
		full_ref->root = ref_root;

		ref->type = BTRFS_EXTENT_DATA_REF_KEY;

	}



	full_ref->objectid = owner;

	full_ref->offset = offset;
@@ -580,10 +585,12 @@ static noinline int add_delayed_data_ref(struct btrfs_trans_handle *trans, 
 * to make sure the delayed ref is eventually processed before this

 * transaction commits.

 */

int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,

int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes, u64 parent,

			       u64 ref_root,  int level, int action,

			       struct btrfs_delayed_extent_op *extent_op)

			       struct btrfs_delayed_extent_op *extent_op,

			       int for_cow)

{

	struct btrfs_delayed_tree_ref *ref;

	struct btrfs_delayed_ref_head *head_ref;
@@ -610,12 +617,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
	 * insert both the head node and the new ref without dropping

	 * the spin lock

	 */

	ret = add_delayed_ref_head(trans, &head_ref->node, bytenr, num_bytes,

				   action, 0);

	ret = add_delayed_ref_head(fs_info, trans, &head_ref->node, bytenr,

				   num_bytes, action, 0);

	BUG_ON(ret);



	ret = add_delayed_tree_ref(trans, &ref->node, bytenr, num_bytes,

				   parent, ref_root, level, action);

	ret = add_delayed_tree_ref(fs_info, trans, &ref->node, bytenr,

				   num_bytes, parent, ref_root, level, action,

				   for_cow);

	BUG_ON(ret);

	spin_unlock(&delayed_refs->lock);

	return 0;
@@ -624,11 +632,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
/*

 * add a delayed data ref. it's similar to btrfs_add_delayed_tree_ref.

 */

int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,

int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes,

			       u64 parent, u64 ref_root,

			       u64 owner, u64 offset, int action,

			       struct btrfs_delayed_extent_op *extent_op)

			       struct btrfs_delayed_extent_op *extent_op,

			       int for_cow)

{

	struct btrfs_delayed_data_ref *ref;

	struct btrfs_delayed_ref_head *head_ref;
@@ -655,18 +665,20 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, 
	 * insert both the head node and the new ref without dropping

	 * the spin lock

	 */

	ret = add_delayed_ref_head(trans, &head_ref->node, bytenr, num_bytes,

				   action, 1);

	ret = add_delayed_ref_head(fs_info, trans, &head_ref->node, bytenr,

				   num_bytes, action, 1);

	BUG_ON(ret);



	ret = add_delayed_data_ref(trans, &ref->node, bytenr, num_bytes,

				   parent, ref_root, owner, offset, action);

	ret = add_delayed_data_ref(fs_info, trans, &ref->node, bytenr,

				   num_bytes, parent, ref_root, owner, offset,

				   action, for_cow);

	BUG_ON(ret);

	spin_unlock(&delayed_refs->lock);

	return 0;

}



int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans,

int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,

				struct btrfs_trans_handle *trans,

				u64 bytenr, u64 num_bytes,

				struct btrfs_delayed_extent_op *extent_op)

{
@@ -683,7 +695,7 @@ int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans, 
	delayed_refs = &trans->transaction->delayed_refs;

	spin_lock(&delayed_refs->lock);



	ret = add_delayed_ref_head(trans, &head_ref->node, bytenr,

	ret = add_delayed_ref_head(fs_info, trans, &head_ref->node, bytenr,

				   num_bytes, BTRFS_UPDATE_DELAYED_HEAD,

				   extent_op->is_data);

	BUG_ON(ret);

fs/btrfs/delayed-ref.h

+10 −5
Original line number Diff line number Diff line
@@ -151,16 +151,21 @@ static inline void btrfs_put_delayed_ref(struct btrfs_delayed_ref_node *ref) 
	}

}



int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,

int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes, u64 parent,

			       u64 ref_root, int level, int action,

			       struct btrfs_delayed_extent_op *extent_op);

int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,

			       struct btrfs_delayed_extent_op *extent_op,

			       int for_cow);

int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes,

			       u64 parent, u64 ref_root,

			       u64 owner, u64 offset, int action,

			       struct btrfs_delayed_extent_op *extent_op);

int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans,

			       struct btrfs_delayed_extent_op *extent_op,

			       int for_cow);

int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,

				struct btrfs_trans_handle *trans,

				u64 bytenr, u64 num_bytes,

				struct btrfs_delayed_extent_op *extent_op);

fs/btrfs/disk-io.c

+2 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,8 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, 
	root->ref_cows = 0;



	leaf = btrfs_alloc_free_block(trans, root, root->leafsize, 0,

				      BTRFS_TREE_LOG_OBJECTID, NULL, 0, 0, 0);

				      BTRFS_TREE_LOG_OBJECTID, NULL,

				      0, 0, 0, 0);

	if (IS_ERR(leaf)) {

		kfree(root);

		return ERR_CAST(leaf);