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

Commit 857cc2fc authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: free reserved space on error in a few places 



While trying to track down a reserved space leak I noticed a few places where we
won't properly clean up reserved space if we have an error, this patch fixes
those up.  Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 0be5dc67

fs/btrfs/extent-tree.c

+19 −2
Original line number Diff line number Diff line
@@ -2234,8 +2234,12 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans, 
{

	int ret = 0;



	if (trans->aborted)

	if (trans->aborted) {

		if (insert_reserved)

			btrfs_pin_extent(root, node->bytenr,

					 node->num_bytes, 1);

		return 0;

	}



	if (btrfs_delayed_ref_is_head(node)) {

		struct btrfs_delayed_ref_head *head;
@@ -2411,6 +2415,14 @@ static noinline int run_clustered_refs(struct btrfs_trans_handle *trans, 
				btrfs_free_delayed_extent_op(extent_op);



				if (ret) {

					/*

					 * Need to reset must_insert_reserved if

					 * there was an error so the abort stuff

					 * can cleanup the reserved space

					 * properly.

					 */

					if (must_insert_reserved)

						locked_ref->must_insert_reserved = 1;

					btrfs_debug(fs_info, "run_delayed_extent_op returned %d", ret);

					spin_lock(&delayed_refs->lock);

					btrfs_delayed_ref_unlock(locked_ref);
@@ -6731,13 +6743,18 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, 
		size += sizeof(*block_info);



	path = btrfs_alloc_path();

	if (!path)

	if (!path) {

		btrfs_free_and_pin_reserved_extent(root, ins->objectid,

						   root->leafsize);

		return -ENOMEM;

	}



	path->leave_spinning = 1;

	ret = btrfs_insert_empty_item(trans, fs_info->extent_root, path,

				      ins, size);

	if (ret) {

		btrfs_free_and_pin_reserved_extent(root, ins->objectid,

						   root->leafsize);

		btrfs_free_path(path);

		return ret;

	}

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -8498,6 +8498,8 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, 
						  ins.offset, 0, 0, 0,

						  BTRFS_FILE_EXTENT_PREALLOC);

		if (ret) {

			btrfs_free_reserved_extent(root, ins.objectid,

						   ins.offset);

			btrfs_abort_transaction(trans, root, ret);

			if (own_trans)

				btrfs_end_transaction(trans, root);