mm: rename page trylock
Converting page lock to new locking bitops requires a change of page flag operation naming, so we might as well convert it to something nicer (!TestSetPageLocked_Lock => trylock_page, SetPageLocked => set_page_locked). This also facilitates lockdeping of page lock. Signed-off-by: Nick Piggin <npiggin@suse.de> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
e9ba969818
commit
529ae9aaa0
@@ -63,7 +63,7 @@ static void release_buffer_page(struct buffer_head *bh)
|
||||
goto nope;
|
||||
|
||||
/* OK, it's a truncated page */
|
||||
if (TestSetPageLocked(page))
|
||||
if (!trylock_page(page))
|
||||
goto nope;
|
||||
|
||||
page_cache_get(page);
|
||||
@@ -446,7 +446,7 @@ void journal_commit_transaction(journal_t *journal)
|
||||
spin_lock(&journal->j_list_lock);
|
||||
}
|
||||
if (unlikely(!buffer_uptodate(bh))) {
|
||||
if (TestSetPageLocked(bh->b_page)) {
|
||||
if (!trylock_page(bh->b_page)) {
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
lock_page(bh->b_page);
|
||||
spin_lock(&journal->j_list_lock);
|
||||
|
Reference in New Issue
Block a user