diff options
| author | Nick Piggin <npiggin@suse.de> | 2008-10-18 20:26:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:32 -0700 |
| commit | 8413ac9d8c9a1366a4f57880723126cd24e5a5c3 (patch) | |
| tree | fcee6ff670dcfccf895a48e92d27f52902d34301 /mm/swapfile.c | |
| parent | a978d6f521063514812a7094dbe5036e056e4de3 (diff) | |
| download | op-kernel-dev-8413ac9d8c9a1366a4f57880723126cd24e5a5c3.zip op-kernel-dev-8413ac9d8c9a1366a4f57880723126cd24e5a5c3.tar.gz | |
mm: page lock use lock bitops
trylock_page, unlock_page open and close a critical section. Hence,
we can use the lock bitops to get the desired memory ordering.
Also, mark trylock as likely to succeed (and remove the annotation from
callers).
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 2a97faf..90cb67a 100644 --- 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; } |
