mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
3e3ab9ccca
28 changed files with 346 additions and 220 deletions
|
|
@ -1633,28 +1633,18 @@ void btrfs_readdir_put_delayed_items(struct inode *inode,
|
|||
int btrfs_should_delete_dir_index(struct list_head *del_list,
|
||||
u64 index)
|
||||
{
|
||||
struct btrfs_delayed_item *curr, *next;
|
||||
int ret;
|
||||
struct btrfs_delayed_item *curr;
|
||||
int ret = 0;
|
||||
|
||||
if (list_empty(del_list))
|
||||
return 0;
|
||||
|
||||
list_for_each_entry_safe(curr, next, del_list, readdir_list) {
|
||||
list_for_each_entry(curr, del_list, readdir_list) {
|
||||
if (curr->key.offset > index)
|
||||
break;
|
||||
|
||||
list_del(&curr->readdir_list);
|
||||
ret = (curr->key.offset == index);
|
||||
|
||||
if (refcount_dec_and_test(&curr->refs))
|
||||
kfree(curr);
|
||||
|
||||
if (ret)
|
||||
return 1;
|
||||
else
|
||||
continue;
|
||||
if (curr->key.offset == index) {
|
||||
ret = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue