Hugh Dickins a2c43eed83
mm: try_to_free_swap replaces remove_exclusive_swap_page ...
remove_exclusive_swap_page(): its problem is in living up to its name.
It doesn't matter if someone else has a reference to the page (raised
page_count); it doesn't matter if the page is mapped into userspace
(raised page_mapcount - though that hints it may be worth keeping the
swap): all that matters is that there be no more references to the swap
(and no writeback in progress).
swapoff (try_to_unuse) has been removing pages from swapcache for years,
with no concern for page count or page mapcount, and we used to have a
comment in lookup_swap_cache() recognizing that: if you go for a page of
swapcache, you'll get the right page, but it could have been removed from
swapcache by the time you get page lock.
So, give up asking for exclusivity: get rid of
remove_exclusive_swap_page(), and remove_exclusive_swap_page_ref() and
remove_exclusive_swap_page_count() which were spawned for the recent LRU
work: replace them by the simpler try_to_free_swap() which just checks
page_swapcount().
Similarly, remove the page_count limitation from free_swap_and_count(),
but assume that it's worth holding on to the swap if page is mapped and
swap nowhere near full. Add a vm_swap_full() test in free_swap_cache()?
It would be consistent, but I think we probably have enough for now.
Signed-off-by: Hugh Dickins <hugh@veritas.com >
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com >
Cc: Rik van Riel <riel@redhat.com >
Cc: Nick Piggin <nickpiggin@yahoo.com.au >
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com >
Cc: Robin Holt <holt@sgi.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-01-06 15:59:03 -08:00
2008-10-20 08:52:40 -07:00
2008-12-03 15:52:35 -08:00
2009-01-02 17:15:07 -02:00
2009-01-04 12:17:43 +01:00
2008-12-23 15:21:38 -05:00
2009-01-04 12:17:42 +01:00
2008-12-22 07:15:03 -08:00
2008-12-31 18:18:13 +01:00
2008-11-05 14:40:25 +01:00
2008-12-16 01:19:41 -08:00
2008-11-04 14:27:15 +01:00
2008-11-20 15:59:56 +01:00
2008-11-20 15:59:56 +01:00
2008-12-23 16:19:00 -05:00
2008-10-21 13:25:28 +11:00
2008-10-13 21:51:51 +01:00
2009-01-04 13:33:20 -08:00
2008-11-10 13:50:19 -08:00
2008-12-30 16:51:43 -05:00
2008-09-12 16:30:20 -07:00
2009-01-02 13:17:13 +00:00
2008-12-22 18:30:29 +00:00
2009-01-02 10:19:37 -08:00
2008-11-11 21:15:50 -05:00
2008-10-20 11:01:52 -07:00
2008-12-29 08:29:50 +01:00
2008-10-10 22:39:31 +02:00
2008-12-03 22:12:38 -08:00
2008-12-03 22:12:38 -08:00
2009-01-04 15:14:42 -05:00
2008-10-16 11:21:39 -07:00
2008-10-16 11:21:39 -07:00
2008-10-20 08:50:25 -07:00
2008-10-20 08:52:42 -07:00
2008-11-14 10:39:24 +11:00
2008-12-29 08:29:50 +01:00
2008-12-30 09:05:13 +10:30
2009-01-01 10:12:19 +10:30
2008-12-29 08:29:50 +01:00
2008-11-26 12:13:34 +01:00
2009-01-04 13:33:20 -08:00
2008-11-28 12:38:38 +01:00
2008-12-29 08:28:44 +01:00
2008-11-12 17:17:18 -08:00
2008-11-14 10:39:23 +11:00
2008-10-21 07:47:22 -04:00
2008-11-07 22:56:00 -08:00
2009-01-06 15:59:01 -08:00
2008-10-16 11:21:32 -07:00
2008-12-13 21:20:26 +10:30
2008-11-09 11:17:33 -08:00
2008-11-30 11:00:15 -08:00
2009-01-02 12:19:34 -08:00
2009-01-02 09:29:43 -08:00
2009-01-02 09:23:03 -08:00
2009-01-02 09:23:03 -08:00
2008-10-14 12:12:02 -07:00
2008-12-29 17:47:23 +10:00
2008-09-08 19:25:24 +02:00
2008-12-05 15:20:10 -05:00
2009-01-01 10:12:30 +10:30
2009-01-06 15:58:59 -08:00
2008-10-23 18:51:22 +04:00
2008-12-25 11:01:43 +11:00
2008-11-24 18:57:41 -05:00
2008-12-25 11:01:33 +11:00
2008-12-31 18:07:38 -05:00
2008-12-21 20:10:29 -08:00
2008-12-08 01:19:06 -08:00
2008-09-12 11:11:21 +02:00
2009-01-06 03:05:09 +00:00
2008-10-22 20:21:31 +02:00
2008-10-13 09:51:43 -07:00
2008-10-21 17:45:06 +01:00
2009-01-04 11:00:05 +01:00
2008-09-19 10:20:41 +02:00
2009-01-03 11:57:35 +01:00
2008-12-29 07:39:34 -05:00
2009-01-05 08:40:21 -08:00
2009-01-05 08:40:25 -08:00
2009-01-05 08:40:25 -08:00
2008-10-15 12:46:51 +01:00
2008-10-16 09:24:47 -07:00
2008-10-16 16:53:13 +02:00
2008-12-29 08:29:50 +01:00
2008-10-12 12:05:55 +02:00
2008-11-23 23:24:32 -08:00
2008-12-15 23:44:31 -08:00
2009-01-04 13:33:20 -08:00
2008-10-16 11:21:30 -07:00
2009-01-04 13:33:20 -08:00
2008-10-20 08:52:37 -07:00
2008-10-16 11:21:30 -07:00
2008-12-29 11:27:46 +02:00
2008-12-22 18:44:05 +09:00
2008-10-09 08:56:19 +02:00
2008-11-20 20:29:48 -08:00
2008-12-31 18:07:42 -05:00
2008-10-08 19:44:18 -04:00
2008-10-21 07:47:06 -04:00
2008-11-20 00:49:27 -08:00
2008-10-15 22:21:11 +02:00
2008-10-30 11:38:45 -07:00
2008-12-31 18:07:42 -05:00
2009-01-05 18:52:54 -08:00
2008-12-16 15:29:15 -08:00
2008-10-21 07:47:06 -04:00
2008-11-26 01:59:45 +01:00
2008-12-21 09:46:45 +01:00
2008-10-16 16:08:57 +02:00
2008-11-24 20:00:40 +01:00
2009-01-02 10:19:38 -08:00
2008-12-29 08:29:51 +01:00
2009-01-06 15:59:01 -08:00
2008-09-22 07:29:31 +01:00
2008-10-16 11:21:40 -07:00
2008-12-30 16:10:19 -08:00
2008-12-08 01:14:16 -08:00
2009-01-04 01:00:53 +01:00
2008-10-14 23:51:02 +02:00
2009-01-04 01:00:51 +01:00
2008-11-27 23:39:48 +00:00
2008-11-20 20:32:15 -08:00
2008-11-25 15:45:46 +01:00
2009-01-06 15:58:58 -08:00
2008-10-22 20:21:30 +02:00
2008-10-17 17:25:11 -03:00
2008-10-22 20:21:33 +02:00
2008-10-16 11:21:38 -07:00
2008-10-24 12:54:18 -04:00
2008-10-15 16:03:01 -07:00
2009-01-02 16:12:56 +01:00
2008-12-01 19:55:25 -08:00
2008-12-12 13:48:20 -05:00
2008-12-17 15:47:48 -08:00
2008-10-13 19:01:08 -07:00
2008-10-13 19:01:08 -07:00
2008-10-13 19:01:08 -07:00
2008-09-22 21:28:11 -07:00
2008-10-01 01:30:19 -07:00
2008-10-09 11:59:55 -07:00
2008-11-04 14:49:57 -08:00
2008-11-03 18:16:50 -08:00
2008-10-13 19:01:08 -07:00
2008-11-16 19:32:39 -08:00
2008-10-07 15:34:37 -07:00
2008-12-31 18:07:42 -05:00
2008-10-29 22:02:09 +01:00
2008-11-15 12:26:44 -08:00
2008-12-25 11:40:29 +01:00
2009-01-03 14:11:08 +01:00
2009-01-03 12:04:39 -08:00
2008-11-03 18:21:45 +01:00
2008-10-16 11:21:33 -07:00
2009-01-03 14:10:09 +01:00
2008-10-16 15:17:40 -07:00
2008-10-15 14:24:08 +02:00
2008-12-16 02:06:23 -08:00
2009-01-02 11:44:09 -08:00
2008-09-14 14:43:39 +02:00
2008-12-26 09:48:18 +01:00
2008-09-22 01:15:02 -07:00
2009-01-02 10:19:40 -08:00
2008-10-12 09:37:01 -02:00
2009-01-05 08:40:30 -08:00
2008-10-23 08:55:01 -07:00
2008-12-23 15:21:56 -05:00
2009-01-05 08:40:30 -08:00
2008-10-16 11:21:31 -07:00
2009-01-05 08:40:25 -08:00
2008-12-31 15:11:46 +01:00
2008-12-30 16:10:19 -08:00
2008-10-31 10:01:56 +01:00
2008-11-14 10:39:24 +11:00
2008-11-14 10:39:14 +11:00
2008-10-09 08:56:04 +02:00
2008-10-16 11:21:29 -07:00
2008-10-14 10:34:22 +02:00
2009-01-03 14:11:07 +01:00
2008-12-31 16:55:47 +02:00
2008-09-23 22:01:33 +01:00
2008-10-20 22:34:12 +01:00
2008-12-30 09:26:11 +10:30
2008-12-28 22:43:21 -05:00
2008-11-27 12:37:54 +01:00
2008-11-16 19:37:55 -08:00
2008-12-30 16:20:19 -08:00
2008-10-13 09:47:43 +11:00
2008-10-09 08:56:06 +02:00
2008-10-10 23:16:16 -04:00
2008-11-28 16:47:41 +01:00
2008-11-16 18:59:45 -08:00
2008-10-20 08:52:39 -07:00
2009-01-06 15:59:00 -08:00
2009-01-06 15:59:00 -08:00
2008-09-13 14:41:52 -07:00
2009-01-06 15:59:00 -08:00
2008-12-16 02:00:48 -08:00
2008-10-20 08:52:31 -07:00
2008-12-29 08:29:50 +01:00
2009-01-06 15:58:58 -08:00
2008-10-14 10:37:17 +02:00
2008-10-20 08:52:39 -07:00
2008-10-29 00:51:25 +01:00
2008-10-22 10:00:23 +11:00
2009-01-05 08:40:13 +10:30
2008-10-22 10:00:23 +11:00
2008-10-16 11:21:30 -07:00
2008-12-10 16:30:15 -08:00
2008-11-06 15:41:21 -08:00
2008-12-08 14:31:59 +01:00
2008-10-30 19:55:00 +01:00
2008-09-05 06:33:59 +02:00
2008-12-31 18:07:38 -05:00
2008-11-19 18:49:57 -08:00
2009-01-04 16:13:40 -08:00
2008-10-08 11:35:01 +02:00
2008-11-20 04:08:29 -08:00
2008-12-15 23:38:52 -08:00
2008-12-23 15:21:45 -05:00
2008-12-23 15:21:56 -05:00
2008-12-23 15:21:37 -05:00
2008-12-23 15:21:56 -05:00
2008-12-19 15:22:54 -05:00
2009-01-06 15:59:00 -08:00
2008-09-08 19:25:24 +02:00
2008-11-24 18:57:41 -05:00
2008-12-21 14:21:14 +11:00
2008-12-04 09:16:45 -08:00
2008-11-19 16:05:00 +11:00
2008-12-10 14:20:03 +01:00
2008-11-30 10:03:35 -08:00
2009-01-06 15:59:02 -08:00
2009-01-04 13:33:20 -08:00
2009-01-06 15:59:00 -08:00
2008-10-16 11:21:49 -07:00
2008-10-13 10:10:37 -07:00
2008-10-22 16:42:43 -07:00
2009-01-02 10:19:44 -08:00
2008-10-22 16:42:35 -07:00
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
2008-12-23 16:27:23 +01:00
2008-12-10 08:01:52 -08:00
2008-09-05 09:24:30 +02:00
2008-10-05 13:33:42 -07:00
2008-09-14 17:24:26 +02:00
2008-10-26 23:07:25 -07:00
2008-11-28 16:24:56 -08:00
2008-10-16 11:21:48 -07:00
2008-12-04 09:09:37 +01:00
2008-11-07 22:56:00 -08:00
2008-11-20 04:10:00 -08:00
2008-10-16 09:24:51 -07:00
2008-10-16 11:21:30 -07:00
2008-10-23 00:11:07 -04:00
2008-09-05 21:35:03 -07:00
2008-12-12 17:00:07 +01:00
2009-01-04 12:17:39 +01:00
2008-09-05 21:35:30 -07:00
2008-10-23 18:54:05 +04:00
2008-10-23 08:55:01 -07:00
2008-12-20 09:15:46 +01:00
2009-01-05 08:40:25 -08:00
2009-01-05 08:40:25 -08:00
2009-01-05 18:31:12 -08:00
2008-10-02 15:53:13 -07:00
2009-01-03 12:01:23 -08:00
2008-11-12 17:17:17 -08:00
2009-01-01 10:12:26 +10:30
2008-11-16 19:37:55 -08:00
2008-11-16 19:39:21 -08:00
2008-12-30 16:10:19 -08:00
2008-12-18 21:56:04 +01:00
2008-10-21 07:49:04 -04:00
2008-10-16 11:21:30 -07:00
2008-09-05 14:39:37 -07:00
2008-10-30 11:38:45 -07:00
2008-12-12 14:45:25 -05:00
2008-12-30 17:31:25 -08:00
2008-12-16 15:53:41 +11:00
2009-01-06 15:59:02 -08:00
2009-01-04 13:33:20 -08:00
2008-10-16 11:21:30 -07:00
2008-11-20 20:52:10 -08:00
2009-01-03 11:56:24 -08:00
2008-11-14 10:39:18 +11:00
2008-12-31 18:07:37 -05:00
2008-12-30 09:05:19 +10:30
2009-01-02 10:19:43 -08:00
2009-01-02 10:19:43 -08:00
2009-01-02 10:19:42 -08:00
2008-10-01 16:13:54 +09:00
2008-12-15 23:42:33 -08:00
2008-12-29 11:45:47 +02:00
2008-09-23 08:09:13 -07:00
2008-09-09 17:41:42 +02:00
2008-10-22 07:00:38 -04:00
2008-12-30 09:05:16 +10:30
2008-12-10 15:12:45 -08:00
2008-11-24 21:27:22 -08:00
2008-10-05 11:16:16 -07:00
2008-11-23 11:53:50 +01:00
2009-01-05 08:40:14 +10:30
2008-10-03 11:46:14 -05:00
2008-11-02 10:15:07 -08:00
2008-10-20 08:52:40 -07:00
2009-01-06 15:59:03 -08:00
2008-12-17 18:58:13 +01:00
2009-01-05 11:54:29 -05:00
2008-10-16 11:21:47 -07:00
2008-10-20 08:52:42 -07:00
2008-10-16 11:21:32 -07:00
2008-10-07 14:43:06 -07:00
2008-11-11 09:30:23 -08:00
2008-10-13 09:51:40 -07:00
2008-09-05 21:35:01 -07:00
2008-12-30 09:05:12 +10:30
2009-01-01 10:12:25 +10:30
2008-10-22 09:48:06 +02:00
2008-11-06 08:42:48 +01:00
2008-12-12 17:01:38 +01:00
2008-12-19 09:21:55 +01:00
2008-09-05 14:39:38 -07:00
2008-11-16 09:01:36 +01:00
2009-01-02 10:19:36 -08:00
2009-01-02 10:19:40 -08:00
2008-12-29 08:29:51 +01:00
2008-09-16 07:44:46 +02:00
2008-11-13 14:45:00 -08:00
2008-11-24 18:57:41 -05:00
2008-12-12 13:00:06 +00:00
2009-01-02 17:11:52 -02:00
2008-12-30 09:26:04 +10:30
2008-12-30 09:26:10 +10:30
2008-11-16 22:41:34 -08:00
2008-12-30 09:25:58 +10:30
2008-12-30 09:26:03 +10:30
2008-10-23 15:48:28 +04:00
2008-10-23 17:35:04 +04:00
2008-10-13 09:51:42 -07:00
2008-10-16 11:21:31 -07:00
2008-11-19 14:47:04 +00:00
2008-10-02 22:48:34 +01:00
2008-11-06 09:05:33 +01:00
2009-01-06 15:59:03 -08:00
2008-10-28 16:01:07 -07:00
a2c43eed83