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

Commit a56dbd89 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: remove btrfs_end_transaction_dmeta() 



Two reasons:
- btrfs_end_transaction_dmeta() is the same as btrfs_end_transaction_throttle()
  so it is unnecessary.
- All the delayed items should be dealt in the current transaction, so the
  workers should not commit the transaction, instead, deal with the delayed
  items as many as possible.

So we can remove btrfs_end_transaction_dmeta()

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 0353808c

fs/btrfs/delayed-inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ again: 
	__btrfs_commit_inode_delayed_items(trans, path, delayed_node);



	trans->block_rsv = block_rsv;

	btrfs_end_transaction_dmeta(trans, root);

	btrfs_end_transaction(trans, root);

	btrfs_btree_balance_dirty_nodelay(root);



release_path:

fs/btrfs/transaction.c

+0 −6
Original line number Diff line number Diff line
@@ -790,12 +790,6 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, 
	return __btrfs_end_transaction(trans, root, 1);

}



int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans,

				struct btrfs_root *root)

{

	return __btrfs_end_transaction(trans, root, 1);

}



/*

 * when btree blocks are allocated, they have some corresponding bits set for

 * them in one of two extent_io trees.  This is used to make sure all of

fs/btrfs/transaction.h

+0 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, 
				   int wait_for_unblock);

int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans,

				   struct btrfs_root *root);

int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans,

				struct btrfs_root *root);

int btrfs_should_end_transaction(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root);

void btrfs_throttle(struct btrfs_root *root);