From e2626765c9fe50baa97e1cfb890231d6311a9786 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Tue, 6 Jan 2009 14:39:56 -0800 Subject: [PATCH] --- yaml --- r: 126229 b: refs/heads/master c: 858a29900ea2d639759e697be901a60b759cdcfb h: refs/heads/master i: 126227: ea09eecf7787d6ad5451caed0a4c6f9cff605304 v: v3 --- [refs] | 2 +- trunk/mm/swapfile.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f95c772477ce..4a02bcd2256a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c60aa176c6de82703f064082b909496fc4fee956 +refs/heads/master: 858a29900ea2d639759e697be901a60b759cdcfb diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c index 763210732b5f..6a078557306a 100644 --- a/trunk/mm/swapfile.c +++ b/trunk/mm/swapfile.c @@ -96,7 +96,7 @@ static int discard_swap(struct swap_info_struct *si) list_for_each_entry(se, &si->extent_list, list) { sector_t start_block = se->start_block << (PAGE_SHIFT - 9); - pgoff_t nr_blocks = se->nr_pages << (PAGE_SHIFT - 9); + sector_t nr_blocks = (sector_t)se->nr_pages << (PAGE_SHIFT - 9); if (se->start_page == 0) { /* Do not discard the swap header page! */ @@ -133,7 +133,7 @@ static void discard_swap_cluster(struct swap_info_struct *si, start_page < se->start_page + se->nr_pages) { pgoff_t offset = start_page - se->start_page; sector_t start_block = se->start_block + offset; - pgoff_t nr_blocks = se->nr_pages - offset; + sector_t nr_blocks = se->nr_pages - offset; if (nr_blocks > nr_pages) nr_blocks = nr_pages;