summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>2014-01-10 21:25:46 +0800
committerChris Mason <clm@fb.com>2014-01-28 13:20:30 -0800
commitf499e40fd97698a1c48d188279647009b21905fe (patch)
tree416f03ad6bad10af662d009688180d5312f6c00d /fs
parentde6e8200669f9b60694ca87eadf0a0a99cbdb6aa (diff)
downloadop-kernel-dev-f499e40fd97698a1c48d188279647009b21905fe.zip
op-kernel-dev-f499e40fd97698a1c48d188279647009b21905fe.tar.gz
Btrfs: optimize to remove unnecessary removal with ulist reallocation
Here we are not going to free memory, no need to remove every node one by one, just init root node here is ok. Cc: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ulist.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c
index b0a523b2..35f5de9 100644
--- a/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@ -207,9 +207,6 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
void *old = NULL;
int i;
- for (i = 0; i < ulist->nnodes; i++)
- rb_erase(&ulist->nodes[i].rb_node, &ulist->root);
-
/*
* if nodes_alloced == ULIST_SIZE no memory has been allocated
* yet, so pass NULL to krealloc
@@ -234,6 +231,7 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
* pointers, so we have to do it ourselves. Otherwise we may
* be bitten by crashes.
*/
+ ulist->root = RB_ROOT;
for (i = 0; i < ulist->nnodes; i++) {
ret = ulist_rbtree_insert(ulist, &ulist->nodes[i]);
if (ret < 0)
OpenPOWER on IntegriCloud