projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
fs
/
btrfs
/
backref.c
diff --git
a/fs/btrfs/backref.c
b/fs/btrfs/backref.c
index
2b88439
..
455a6b2
100644
(file)
--- a/
fs/btrfs/backref.c
+++ b/
fs/btrfs/backref.c
@@
-589,6
+589,7
@@
static void __merge_refs(struct list_head *head, int mode)
list_del(&ref2->list);
kmem_cache_free(btrfs_prelim_ref_cache, ref2);
+ cond_resched();
}
}