Commit b4eec2ca authored by Liu Hui's avatar Liu Hui Committed by Chris Mason
Browse files

Btrfs: Some fixes for batching extent insert. 



In insert_extents(), when ret==1 and last is not zero, it should
check if the current inserted item is the last item in this batching
inserts. If so, it should just break from loop. If not, 'cur =
insert_list->next' will make no sense because the list is empty now,
and 'op' will point to an unexpectable place.

There are also some trivial fixs in this patch including one comment
typo error and deleting two redundant lines.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent ea9e8b11

fs/btrfs/ctree.c

+0 −2
Original line number Diff line number Diff line
@@ -3041,7 +3041,6 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans, 
	struct btrfs_item *item;

	int ret = 0;

	int slot;

	int slot_orig;

	int i;

	u32 nritems;

	u32 total_data = 0;
@@ -3064,7 +3063,6 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans, 
	if (ret < 0)

		goto out;



	slot_orig = path->slots[0];

	leaf = path->nodes[0];



	nritems = btrfs_header_nritems(leaf);

fs/btrfs/extent-tree.c

+7 −3
Original line number Diff line number Diff line
@@ -798,9 +798,12 @@ static int noinline insert_extents(struct btrfs_trans_handle *trans, 
			 */

			i = last;

			last = 0;

			cur = insert_list->next;

			op = list_entry(cur, struct pending_extent_op, list);

			total--;

			if (i < total) {

				cur = insert_list->next;

				op = list_entry(cur, struct pending_extent_op,

						list);

			}

		} else {

			i += ret;

		}
@@ -2150,6 +2153,7 @@ again: 
		if (ret) {

			if (skipped && all && !num_inserts) {

				skipped = 0;

				search = 0;

				continue;

			}

			mutex_unlock(&info->extent_ins_mutex);
@@ -2189,7 +2193,7 @@ again: 
	}



	/*

	 * process teh update list, clear the writeback bit for it, and if

	 * process the update list, clear the writeback bit for it, and if

	 * somebody marked this thing for deletion then just unlock it and be

	 * done, the free_extents will handle it

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE