Commit fe84a1e2 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove end_no_trans label from btrfs_log_inode_parent() 



It's a pointless label as we don't have to do anything under it other
than return from the function. So remove it and directly return from the
function where we used to goto.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 26558ce5

fs/btrfs/tree-log.c

+10 −18
Original line number Diff line number Diff line
@@ -7038,24 +7038,18 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, 
	int ret = 0;

	bool log_dentries;



	if (btrfs_test_opt(fs_info, NOTREELOG)) {

		ret = BTRFS_LOG_FORCE_COMMIT;

		goto end_no_trans;

	}

	if (btrfs_test_opt(fs_info, NOTREELOG))

		return BTRFS_LOG_FORCE_COMMIT;



	if (btrfs_root_refs(&root->root_item) == 0) {

		ret = BTRFS_LOG_FORCE_COMMIT;

		goto end_no_trans;

	}

	if (btrfs_root_refs(&root->root_item) == 0)

		return BTRFS_LOG_FORCE_COMMIT;



	/*

	 * If we're logging an inode from a subvolume created in the current

	 * transaction we must force a commit since the root is not persisted.

	 */

	if (btrfs_root_generation(&root->root_item) == trans->transid) {

		ret = BTRFS_LOG_FORCE_COMMIT;

		goto end_no_trans;

	}

	if (btrfs_root_generation(&root->root_item) == trans->transid)

		return BTRFS_LOG_FORCE_COMMIT;



	/*

	 * Skip already logged inodes or inodes corresponding to tmpfiles
@@ -7064,14 +7058,12 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, 
	 */

	if ((btrfs_inode_in_log(inode, trans->transid) &&

	     list_empty(&ctx->ordered_extents)) ||

	    inode->vfs_inode.i_nlink == 0) {

		ret = BTRFS_NO_LOG_SYNC;

		goto end_no_trans;

	}

	    inode->vfs_inode.i_nlink == 0)

		return BTRFS_NO_LOG_SYNC;



	ret = start_log_trans(trans, root, ctx);

	if (ret)

		goto end_no_trans;

		return ret;



	ret = btrfs_log_inode(trans, inode, inode_only, ctx);

	if (ret)
@@ -7158,7 +7150,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, 
	if (ret)

		btrfs_remove_log_ctx(root, ctx);

	btrfs_end_log_trans(root);

end_no_trans:



	return ret;

}