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

Commit f499e40f authored by Wang Shilong's avatar Wang Shilong Committed by Chris Mason
Browse files

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: default avatarWang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent de6e8200

fs/btrfs/ulist.c

+1 −3
Original line number Diff line number Diff line
@@ -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)