From: Hugh Dickins <hugh@veritas.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 06/13] swap unsigned int consistency
Date: Sat, 9 Jul 2005 01:05:35 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.61.0507090104470.13391@goblin.wat.veritas.com> (raw)
In-Reply-To: <Pine.LNX.4.61.0507090057340.13391@goblin.wat.veritas.com>
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>
---
include/linux/swap.h | 6 +++---
mm/swapfile.c | 17 +++++++++--------
2 files changed, 12 insertions(+), 11 deletions(-)
--- swap5/include/linux/swap.h 2005-07-08 19:14:12.000000000 +0100
+++ swap6/include/linux/swap.h 2005-07-08 19:14:26.000000000 +0100
@@ -129,10 +129,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 */
};
--- swap5/mm/swapfile.c 2005-07-08 19:14:12.000000000 +0100
+++ swap6/mm/swapfile.c 2005-07-08 19:14:26.000000000 +0100
@@ -82,7 +82,7 @@ void swap_unplug_io_fn(struct backing_de
up_read(&swap_unplug_sem);
}
-static inline int scan_swap_map(struct swap_info_struct *si)
+static inline unsigned long scan_swap_map(struct swap_info_struct *si)
{
unsigned long offset;
/*
@@ -529,10 +529,11 @@ static int unuse_mm(struct mm_struct *mm
* Scan swap_map from current position to next entry still in use.
* Recycle to start on reaching the end, returning 0 when empty.
*/
-static int find_next_to_unuse(struct swap_info_struct *si, int prev)
+static unsigned int find_next_to_unuse(struct swap_info_struct *si,
+ unsigned int prev)
{
- int max = si->max;
- int i = prev;
+ unsigned int max = si->max;
+ unsigned int i = prev;
int count;
/*
@@ -575,7 +576,7 @@ static int try_to_unuse(unsigned int typ
unsigned short swcount;
struct page *page;
swp_entry_t entry;
- int i = 0;
+ unsigned int i = 0;
int retval = 0;
int reset_overflow = 0;
int shmem;
@@ -1214,7 +1215,7 @@ static int swap_show(struct seq_file *sw
file = ptr->swap_file;
len = seq_path(swap, file->f_vfsmnt, file->f_dentry, " \t\n\\");
- seq_printf(swap, "%*s%s\t%d\t%ld\t%d\n",
+ seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
len < 40 ? 40 - len : 1, " ",
S_ISBLK(file->f_dentry->d_inode->i_mode) ?
"partition" : "file\t",
@@ -1273,7 +1274,7 @@ asmlinkage long sys_swapon(const char __
static int least_priority;
union swap_header *swap_header = NULL;
int swap_header_version;
- int nr_good_pages = 0;
+ unsigned int nr_good_pages = 0;
int nr_extents;
sector_t span;
unsigned long maxpages = 1;
@@ -1507,7 +1508,7 @@ asmlinkage long sys_swapon(const char __
nr_swap_pages += nr_good_pages;
total_swap_pages += nr_good_pages;
- printk(KERN_INFO "Adding %dk swap on %s. "
+ printk(KERN_INFO "Adding %uk swap on %s. "
"Priority:%d extents:%d across:%lluk\n",
nr_good_pages<<(PAGE_SHIFT-10), name, p->prio,
nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10));
next prev parent reply other threads:[~2005-07-09 0:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-09 0:00 [PATCH 00/13] some swapfile patches Hugh Dickins
2005-07-09 0:01 ` [PATCH 01/13] update swapfile i_sem comment Hugh Dickins
2005-07-09 0:01 ` [PATCH 02/13] correct swapfile nr_good_pages Hugh Dickins
2005-07-09 0:02 ` [PATCH 03/13] move destroy_swap_extents calls Hugh Dickins
2005-07-09 0:03 ` [PATCH 04/13] swap extent list is ordered Hugh Dickins
2005-07-09 0:04 ` [PATCH 05/13] show span of swap extents Hugh Dickins
2005-07-09 0:05 ` Hugh Dickins [this message]
2005-07-09 0:06 ` [PATCH 07/13] freeing update swap_list.next Hugh Dickins
2005-07-09 0:07 ` [PATCH 08/13] get_swap_page drop swap_list_lock Hugh Dickins
2005-07-09 0:08 ` [PATCH 09/13] scan_swap_map restyled Hugh Dickins
2005-07-09 0:09 ` [PATCH 10/13] scan_swap_map drop swap_device_lock Hugh Dickins
2005-07-09 0:10 ` [PATCH 11/13] scan_swap_map latency breaks Hugh Dickins
2005-07-09 0:11 ` [PATCH 12/13] swap_lock replace list+device Hugh Dickins
2005-07-09 0:15 ` [PATCH 13/13] update swsusp use of swap_info Hugh Dickins
2005-07-09 11:13 ` [PATCH 14/13] swsusp mod needed parentheses Hugh Dickins
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=Pine.LNX.4.61.0507090104470.13391@goblin.wat.veritas.com \
--to=hugh@veritas.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®