diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2011-05-24 20:11:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:39:08 -0400 |
commit | f62e00cc3a00bfbd394a79fc22b334c31f91bd5f (patch) | |
tree | 29e0a3ac793e4a5a15bbbe4b4945470a41e820e7 /mm | |
parent | fa25c503dfa203b921199ea42c0046c89f2ed49f (diff) |
mm: introduce wait_on_page_locked_killable()
commit 2687a356 ("Add lock_page_killable") introduced killable
lock_page(). Similarly this patch introdues killable
wait_on_page_locked().
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index c641edf553a9..dea8a38bb2bb 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -562,6 +562,17 @@ void wait_on_page_bit(struct page *page, int bit_nr) | |||
562 | } | 562 | } |
563 | EXPORT_SYMBOL(wait_on_page_bit); | 563 | EXPORT_SYMBOL(wait_on_page_bit); |
564 | 564 | ||
565 | int wait_on_page_bit_killable(struct page *page, int bit_nr) | ||
566 | { | ||
567 | DEFINE_WAIT_BIT(wait, &page->flags, bit_nr); | ||
568 | |||
569 | if (!test_bit(bit_nr, &page->flags)) | ||
570 | return 0; | ||
571 | |||
572 | return __wait_on_bit(page_waitqueue(page), &wait, | ||
573 | sleep_on_page_killable, TASK_KILLABLE); | ||
574 | } | ||
575 | |||
565 | /** | 576 | /** |
566 | * add_page_wait_queue - Add an arbitrary waiter to a page's wait queue | 577 | * add_page_wait_queue - Add an arbitrary waiter to a page's wait queue |
567 | * @page: Page defining the wait queue of interest | 578 | * @page: Page defining the wait queue of interest |