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

Commit d52c1bcc authored by Liu Bo's avatar Liu Bo Committed by Chris Mason
Browse files

Btrfs: avoid heavy operations in btrfs_commit_super 



The 'git blame' history shows that, the old transaction commit code has to do
twice to ensure roots are updated and we have to flush metadata and super block
manually, however, right now all of these can be handled well inside
the transaction commit code without extra efforts.

And the error handling part remains same with the current code, -- 'return to
caller once we get error'.

This saves us a transaction commit and a flush of super block, which are both
heavy operations according to ftrace output analysis.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent ba69994a

fs/btrfs/disk-io.c

+1 −20
Original line number Diff line number Diff line
@@ -3517,7 +3517,6 @@ int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info) 
int btrfs_commit_super(struct btrfs_root *root)

{

	struct btrfs_trans_handle *trans;

	int ret;



	mutex_lock(&root->fs_info->cleaner_mutex);

	btrfs_run_delayed_iputs(root);
@@ -3531,25 +3530,7 @@ int btrfs_commit_super(struct btrfs_root *root) 
	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		return PTR_ERR(trans);

	ret = btrfs_commit_transaction(trans, root);

	if (ret)

		return ret;

	/* run commit again to drop the original snapshot */

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		return PTR_ERR(trans);

	ret = btrfs_commit_transaction(trans, root);

	if (ret)

		return ret;

	ret = btrfs_write_and_wait_transaction(NULL, root);

	if (ret) {

		btrfs_error(root->fs_info, ret,

			    "Failed to sync btree inode to disk.");

		return ret;

	}



	ret = write_ctree_super(NULL, root, 0);

	return ret;

	return btrfs_commit_transaction(trans, root);

}



int close_ctree(struct btrfs_root *root)