Btrfs: abort transaction if we don't find the block group (df95e7f0) · Commits · 戴 / test

We shouldn't BUG_ON() if there is corruption. I hit this while testing my block group patch and the abort worked properly. Thanks, Signed-off-by:

fs/btrfs/extent-tree.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3139,9 +3139,11 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
		struct extent_buffer *leaf;

		ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
		if (ret < 0)
		if (ret) {
		if (ret > 0)
		ret = -ENOENT;
		goto fail;
		BUG_ON(ret); /* Corruption */
		}

		leaf = path->nodes[0];
		bi = btrfs_item_ptr_offset(leaf, path->slots[0]);
		@@ -3149,11 +3151,9 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
		btrfs_mark_buffer_dirty(leaf);
		btrfs_release_path(path);
		fail:
		if (ret) {
		if (ret)
		btrfs_abort_transaction(trans, root, ret);
		return ret;
		}
		return 0;

		}