aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/swap.h
diff options
context:
space:
mode:
authorHugh Dickins <hugh.dickins@tiscali.co.uk>2009-12-14 20:58:44 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 11:53:15 -0500
commit253d553ba75ab26b3e9e2f70cbf6fbf0813f7e86 (patch)
tree57c448fad45820c0eb984297fbef120b689381a0 /include/linux/swap.h
parent73c34b6accc8427584f5d7db4d5acb230ed8c912 (diff)
swap_info: SWAP_HAS_CACHE cleanups
Though swap_count() is useful, I'm finding that swap_has_cache() and encode_swapmap() obscure what happens in the swap_map entry, just at those points where I need to understand it. Remove them, and pass more usable "usage" values to scan_swap_map(), swap_entry_free() and __swap_duplicate(), instead of the SWAP_MAP and SWAP_CACHE enum. Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/swap.h')
-rw-r--r--include/linux/swap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 109dfe794237..c9d8870892b8 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -154,7 +154,7 @@ enum {
154#define SWAP_MAP_MAX 0x7ffe 154#define SWAP_MAP_MAX 0x7ffe
155#define SWAP_MAP_BAD 0x7fff 155#define SWAP_MAP_BAD 0x7fff
156#define SWAP_HAS_CACHE 0x8000 /* There is a swap cache of entry. */ 156#define SWAP_HAS_CACHE 0x8000 /* There is a swap cache of entry. */
157#define SWAP_COUNT_MASK (~SWAP_HAS_CACHE) 157
158/* 158/*
159 * The in-memory structure used to track swap areas. 159 * The in-memory structure used to track swap areas.
160 */ 160 */