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 /include/linux/pagemap.h | |
| parent | a978d6f521063514812a7094dbe5036e056e4de3 (diff) | |
| download | blackbird-op-linux-8413ac9d8c9a1366a4f57880723126cd24e5a5c3.tar.gz blackbird-op-linux-8413ac9d8c9a1366a4f57880723126cd24e5a5c3.zip | |
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 'include/linux/pagemap.h')
| -rw-r--r-- | include/linux/pagemap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 7334b2b6c4c6..709742be02f0 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -311,7 +311,7 @@ static inline void __clear_page_locked(struct page *page) static inline int trylock_page(struct page *page) { - return !test_and_set_bit(PG_locked, &page->flags); + return (likely(!test_and_set_bit_lock(PG_locked, &page->flags))); } /* |
