From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: lkml <linux-kernel@vger.kernel.org>, linux-arch@vger.kernel.org
Cc: Zach Brown <zach.brown@oracle.com>, Ingo Molnar <mingo@elte.hu>,
akpm@linux-foundation.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 06/12] mm: remove raw SetPageLocked() usage
Date: Fri, 28 Sep 2007 09:42:06 +0200 [thread overview]
Message-ID: <20070928080042.020756000@chello.nl> (raw)
In-Reply-To: 20070928074200.436463000@chello.nl
[-- Attachment #1: lock_page.patch --]
[-- Type: text/plain, Size: 1284 bytes --]
Remove the last few SetPageLocked() instances.
use trylock_page() instead of SetPageLocked() because we hold tree_lock
so we cannot suffer the might_sleep(). Also at least add_to_page_cache() can
be handed a locked page.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
mm/filemap.c | 2 +-
mm/swap_state.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/mm/filemap.c
===================================================================
--- linux-2.6.orig/mm/filemap.c
+++ linux-2.6/mm/filemap.c
@@ -445,7 +445,7 @@ int add_to_page_cache(struct page *page,
error = radix_tree_insert(&mapping->page_tree, offset, page);
if (!error) {
page_cache_get(page);
- SetPageLocked(page);
+ trylock_page(page);
page->mapping = mapping;
page->index = offset;
mapping->nrpages++;
Index: linux-2.6/mm/swap_state.c
===================================================================
--- linux-2.6.orig/mm/swap_state.c
+++ linux-2.6/mm/swap_state.c
@@ -83,7 +83,7 @@ static int __add_to_swap_cache(struct pa
entry.val, page);
if (!error) {
page_cache_get(page);
- SetPageLocked(page);
+ trylock_page(page);
SetPageSwapCache(page);
set_page_private(page, entry.val);
total_swapcache_pages++;
--
next prev parent reply other threads:[~2007-09-28 8:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 7:42 [PATCH 00/12] various lockdep patches Peter Zijlstra
2007-09-28 7:42 ` [PATCH 01/12] lockdep: syscall exit check Peter Zijlstra
2007-09-28 12:03 ` Heiko Carstens
2007-09-28 12:14 ` Peter Zijlstra
2007-09-28 12:21 ` Heiko Carstens
2007-09-28 7:42 ` [PATCH 02/12] lockdep: i386: connect the sysexit hook Peter Zijlstra
2007-09-28 7:42 ` [PATCH 03/12] lockdep: x86_64: " Peter Zijlstra
2007-09-28 7:42 ` [PATCH 04/12] lockdep: annotate journal_start() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 05/12] mm: trylock_page Peter Zijlstra
2007-09-28 3:11 ` Nick Piggin
2007-09-29 15:01 ` Peter Zijlstra
2007-10-02 8:44 ` Nick Piggin
2007-09-28 7:42 ` Peter Zijlstra [this message]
2007-09-28 8:22 ` [PATCH 06/12] mm: remove raw SetPageLocked() usage Christoph Hellwig
2007-09-28 7:42 ` [PATCH 07/12] lockdep: page lock hooks Peter Zijlstra
2007-09-28 7:42 ` [PATCH 08/12] lockdep: increase MAX_LOCK_DEPTH Peter Zijlstra
2007-09-28 7:42 ` [PATCH 09/12] lockdep: add a page lock class per filesystem type Peter Zijlstra
2007-09-28 7:42 ` [PATCH 10/12] lockdep: lock_page: handle IO-completions Peter Zijlstra
2007-09-28 7:42 ` [PATCH 11/12] mm: set_page_mapping() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 12/12] lockdep: enable lock_page lockdep annotation Peter Zijlstra
2007-09-28 11:49 ` [PATCH 00/12] various lockdep patches Heiko Carstens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070928080042.020756000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=zach.brown@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).