summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2005-09-03 15:54:35 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:05:41 -0700
commit6eb396dc4a9781c5e7951143ab56ce5710687ab3 (patch)
tree48b165c8934a0f3852344725fee060740dcdfa48 /include/linux
parent53092a7402f227151a681b0c92ec8598c5618b1a (diff)
downloadblackbird-op-linux-6eb396dc4a9781c5e7951143ab56ce5710687ab3.tar.gz
blackbird-op-linux-6eb396dc4a9781c5e7951143ab56ce5710687ab3.zip
[PATCH] swap: swap unsigned int consistency
The swap header's unsigned int last_page determines the range of swap pages, but swap_info has been using int or unsigned long in some cases: use unsigned int throughout (except, in several places a local unsigned long is useful to avoid overflows when adding). Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/swap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index f2b16ac0b539..93f0eca7f916 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -130,10 +130,10 @@ struct swap_info_struct {
unsigned int highest_bit;
unsigned int cluster_next;
unsigned int cluster_nr;
+ unsigned int pages;
+ unsigned int max;
+ unsigned int inuse_pages;
int prio; /* swap priority */
- int pages;
- unsigned long max;
- unsigned long inuse_pages;
int next; /* next entry on swap list */
};
OpenPOWER on IntegriCloud