1 files changed, 50 insertions, 0 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 72e9fa3c31f5..5bc7a0d325e7 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -198,6 +198,56 @@ static int mergable_maps(struct extent_map *prev, struct extent_map *next)
        return 0;
 }
+int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len)
+{
+        int ret = 0;
+        struct extent_map *merge = NULL;
+        struct rb_node *rb;
+        struct extent_map *em;
+        write_lock(&tree->lock);
+        em = lookup_extent_mapping(tree, start, len);
+        WARN_ON(em->start != start || !em);
+        if (!em)
+                goto out;
+        clear_bit(EXTENT_FLAG_PINNED, &em->flags);
+        if (em->start != 0) {
+                rb = rb_prev(&em->rb_node);
+                if (rb)
+                        merge = rb_entry(rb, struct extent_map, rb_node);
+                if (rb && mergable_maps(merge, em)) {
+                        em->start = merge->start;
+                        em->len += merge->len;
+                        em->block_len += merge->block_len;
+                        em->block_start = merge->block_start;
+                        merge->in_tree = 0;
+                        rb_erase(&merge->rb_node, &tree->map);
+                        free_extent_map(merge);
+                }
+        }
+        rb = rb_next(&em->rb_node);
+        if (rb)
+                merge = rb_entry(rb, struct extent_map, rb_node);
+        if (rb && mergable_maps(em, merge)) {
+                em->len += merge->len;
+                em->block_len += merge->len;
+                rb_erase(&merge->rb_node, &tree->map);
+                merge->in_tree = 0;
+                free_extent_map(merge);
+        }
+        free_extent_map(em);
+out:
+        write_unlock(&tree->lock);
+        return ret;
+}
 /**
 * add_extent_mapping - add new extent map to the extent tree
 * @tree:       tree to insert new map in

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 72e9fa3c31f5..5bc7a0d325e7 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c
@@ -198,6 +198,56 @@ static int mergable_maps(struct extent_map prev, struct extent_map next)
198	return 0;	198	return 0;
199	}	199	}
200		200
		201	int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len)
		202	{
		203	int ret = 0;
		204	struct extent_map *merge = NULL;
		205	struct rb_node *rb;
		206	struct extent_map *em;
		207
		208	write_lock(&tree->lock);
		209	em = lookup_extent_mapping(tree, start, len);
		210
		211	WARN_ON(em->start != start \|\| !em);
		212
		213	if (!em)
		214	goto out;
		215
		216	clear_bit(EXTENT_FLAG_PINNED, &em->flags);
		217
		218	if (em->start != 0) {
		219	rb = rb_prev(&em->rb_node);
		220	if (rb)
		221	merge = rb_entry(rb, struct extent_map, rb_node);
		222	if (rb && mergable_maps(merge, em)) {
		223	em->start = merge->start;
		224	em->len += merge->len;
		225	em->block_len += merge->block_len;
		226	em->block_start = merge->block_start;
		227	merge->in_tree = 0;
		228	rb_erase(&merge->rb_node, &tree->map);
		229	free_extent_map(merge);
		230	}
		231	}
		232
		233	rb = rb_next(&em->rb_node);
		234	if (rb)
		235	merge = rb_entry(rb, struct extent_map, rb_node);
		236	if (rb && mergable_maps(em, merge)) {
		237	em->len += merge->len;
		238	em->block_len += merge->len;
		239	rb_erase(&merge->rb_node, &tree->map);
		240	merge->in_tree = 0;
		241	free_extent_map(merge);
		242	}
		243
		244	free_extent_map(em);
		245	out:
		246	write_unlock(&tree->lock);
		247	return ret;
		248
		249	}
		250
201	/**	251	/**
202	* add_extent_mapping - add new extent map to the extent tree	252	* add_extent_mapping - add new extent map to the extent tree
203	* @tree: tree to insert new map in	253	* @tree: tree to insert new map in