projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index 2a97fafa3d89684c8fb6770650d91f905faa7a64..90cb67a5417cccea9f0352b6316f747bec4c608d 100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-422,7
+422,7
@@
void free_swap_and_cache(swp_entry_t entry)
if (p) {
if (swap_entry_free(p, swp_offset(entry)) == 1) {
page = find_get_page(&swapper_space, entry.val);
- if (page &&
unlikely(!trylock_page(page)
)) {
+ if (page &&
!trylock_page(page
)) {
page_cache_release(page);
page = NULL;
}