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

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

Btrfs: add a type field for the transaction handle 



This patch add a type field into the transaction handle structure,
in this way, we needn't implement various end-transaction functions
and can make the code more simple and readable.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
parent e8830e60

fs/btrfs/inode.c

+4 −15
Original line number Diff line number Diff line
@@ -1363,11 +1363,7 @@ static noinline int run_delalloc_nocow(struct inode *inode, 
	}



error:

	if (nolock) {

		err = btrfs_end_transaction_nolock(trans, root);

	} else {

	err = btrfs_end_transaction(trans, root);

	}

	if (!ret)

		ret = err;
@@ -1957,12 +1953,8 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
out:

	if (root != root->fs_info->tree_root)

		btrfs_delalloc_release_metadata(inode, ordered_extent->len);

	if (trans) {

		if (nolock)

			btrfs_end_transaction_nolock(trans, root);

		else

	if (trans)

		btrfs_end_transaction(trans, root);

	}



	if (ret)

		clear_extent_uptodate(io_tree, ordered_extent->file_offset,
@@ -4524,9 +4516,6 @@ int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc) 
			trans = btrfs_join_transaction(root);

		if (IS_ERR(trans))

			return PTR_ERR(trans);

		if (nolock)

			ret = btrfs_end_transaction_nolock(trans, root);

		else

		ret = btrfs_commit_transaction(trans, root);

	}

	return ret;

fs/btrfs/transaction.c

+6 −23
Original line number Diff line number Diff line
@@ -267,14 +267,6 @@ static void wait_current_trans(struct btrfs_root *root) 
	}

}



enum btrfs_trans_type {

	TRANS_START,

	TRANS_JOIN,

	TRANS_USERSPACE,

	TRANS_JOIN_NOLOCK,

	TRANS_JOIN_FREEZE,

};



static int may_wait_transaction(struct btrfs_root *root, int type)

{

	if (root->fs_info->log_root_recovering)
@@ -388,6 +380,7 @@ static struct btrfs_trans_handle *start_transaction(struct btrfs_root *root, 
	h->aborted = 0;

	h->qgroup_reserved = qgroup_reserved;

	h->delayed_ref_elem.seq = 0;

	h->type = type;

	INIT_LIST_HEAD(&h->qgroup_ref_list);

	INIT_LIST_HEAD(&h->new_bgs);
@@ -540,11 +533,12 @@ int btrfs_should_end_transaction(struct btrfs_trans_handle *trans, 
}



static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, int throttle, int lock)

			  struct btrfs_root *root, int throttle)

{

	struct btrfs_transaction *cur_trans = trans->transaction;

	struct btrfs_fs_info *info = root->fs_info;

	int count = 0;

	int lock = (trans->type != TRANS_JOIN_NOLOCK);

	int err = 0;



	if (--trans->use_count) {
@@ -645,7 +639,7 @@ int btrfs_end_transaction(struct btrfs_trans_handle *trans, 
{

	int ret;



	ret = __btrfs_end_transaction(trans, root, 0, 1);

	ret = __btrfs_end_transaction(trans, root, 0);

	if (ret)

		return ret;

	return 0;
@@ -656,18 +650,7 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, 
{

	int ret;



	ret = __btrfs_end_transaction(trans, root, 1, 1);

	if (ret)

		return ret;

	return 0;

}



int btrfs_end_transaction_nolock(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root)

{

	int ret;



	ret = __btrfs_end_transaction(trans, root, 0, 0);

	ret = __btrfs_end_transaction(trans, root, 1);

	if (ret)

		return ret;

	return 0;
@@ -676,7 +659,7 @@ int btrfs_end_transaction_nolock(struct btrfs_trans_handle *trans, 
int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans,

				struct btrfs_root *root)

{

	return __btrfs_end_transaction(trans, root, 1, 1);

	return __btrfs_end_transaction(trans, root, 1);

}



/*

fs/btrfs/transaction.h

+11 −4
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ struct btrfs_transaction { 
	int aborted;

};



enum btrfs_trans_type {

	TRANS_START,

	TRANS_JOIN,

	TRANS_USERSPACE,

	TRANS_JOIN_NOLOCK,

	TRANS_JOIN_FREEZE,

};



struct btrfs_trans_handle {

	u64 transid;

	u64 bytes_reserved;
@@ -58,8 +66,9 @@ struct btrfs_trans_handle { 
	struct btrfs_transaction *transaction;

	struct btrfs_block_rsv *block_rsv;

	struct btrfs_block_rsv *orig_rsv;

	int aborted;

	int adding_csums;

	short aborted;

	short adding_csums;

	enum btrfs_trans_type type;

	/*

	 * this root is only needed to validate that the root passed to

	 * start_transaction is the same as the one passed to end_transaction.
@@ -94,8 +103,6 @@ static inline void btrfs_set_inode_last_trans(struct btrfs_trans_handle *trans, 


int btrfs_end_transaction(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root);

int btrfs_end_transaction_nolock(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root);

struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,

						   int num_items);

struct btrfs_trans_handle *btrfs_start_transaction_noflush(