openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Liu Hui 2008-11-18 11:30:10 -05:00 committed by Chris Mason
parent ea9e8b11bd
commit b4eec2ca11
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.c
View File

@ -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);

10
fs/btrfs/extent-tree.c
View File

@ -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 @@ static int finish_current_insert(struct btrfs_trans_handle *trans,
if (ret) {
if (skipped && all && !num_inserts) {
skipped = 0;
search = 0;
continue;
}
mutex_unlock(&info->extent_ins_mutex);
@ -2189,7 +2193,7 @@ static int finish_current_insert(struct btrfs_trans_handle *trans,
}
/*
* 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
*/