From: Cesar Eduardo Barros <cesarb@cesarb.net>
To: linux-mm@kvack.org
Cc: Cesar Eduardo Barros <cesarb@cesarb.net>
Subject: [PATCH 21/24] sys_swapon: remove nr_good_pages variable
Date: Sat, 12 Feb 2011 16:49:22 -0200 [thread overview]
Message-ID: <1297536565-8059-21-git-send-email-cesarb@cesarb.net> (raw)
In-Reply-To: <4D56D5F9.8000609@cesarb.net>
It still exists within setup_swap_map_and_extents(), but after it
nr_good_pages == p->pages.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
---
mm/swapfile.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index d2404ca..5ec7183 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2039,7 +2039,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
int i, prev;
int error;
union swap_header *swap_header;
- unsigned int nr_good_pages;
int nr_extents;
sector_t span;
unsigned long maxpages;
@@ -2123,7 +2122,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
error = nr_extents;
goto bad_swap;
}
- nr_good_pages = p->pages;
if (p->bdev) {
if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
@@ -2143,12 +2141,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
p->prio = --least_priority;
p->swap_map = swap_map;
p->flags |= SWP_WRITEOK;
- nr_swap_pages += nr_good_pages;
- total_swap_pages += nr_good_pages;
+ nr_swap_pages += p->pages;
+ total_swap_pages += p->pages;
printk(KERN_INFO "Adding %uk swap on %s. "
"Priority:%d extents:%d across:%lluk %s%s\n",
- nr_good_pages<<(PAGE_SHIFT-10), name, p->prio,
+ p->pages<<(PAGE_SHIFT-10), name, p->prio,
nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),
(p->flags & SWP_SOLIDSTATE) ? "SS" : "",
(p->flags & SWP_DISCARDABLE) ? "D" : "");
--
1.7.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-02-12 18:49 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-12 18:48 [PATCH 00/24] Refactor sys_swapon Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 01/24] sys_swapon: use vzalloc instead of vmalloc/memset Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 02/24] sys_swapon: remove changelog from function comment Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 03/24] sys_swapon: do not depend on "type" after allocation Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 04/24] sys_swapon: separate swap_info allocation Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 05/24] sys_swapon: simplify error return from " Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 06/24] sys_swapon: simplify error flow in alloc_swap_info Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 07/24] sys_swapon: remove initial value of name variable Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 08/24] sys_swapon: move setting of error nearer use Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 09/24] sys_swapon: remove did_down variable Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 10/24] sys_swapon: remove bdev variable Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 11/24] sys_swapon: do only cleanup in the cleanup blocks Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 12/24] sys_swapon: use a single error label Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 13/24] sys_swapon: separate bdev claim and inode lock Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 14/24] sys_swapon: simplify error flow in claim_swapfile Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 15/24] sys_swapon: move setting of swapfilepages near use Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 16/24] sys_swapon: separate parsing of swapfile header Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 17/24] sys_swapon: simplify error flow in read_swap_header Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 18/24] sys_swapon: call swap_cgroup_swapon earlier Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 19/24] sys_swapon: separate parsing of bad blocks and extents Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 20/24] sys_swapon: simplify error flow in setup_swap_map_and_extents Cesar Eduardo Barros
2011-02-12 18:49 ` Cesar Eduardo Barros [this message]
2011-02-12 18:49 ` [PATCH 22/24] sys_swapon: move printk outside lock Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 23/24] sys_swapoff: change order to match sys_swapon Cesar Eduardo Barros
2011-02-12 18:49 ` [PATCH 24/24] sys_swapon: separate final enabling of the swapfile Cesar Eduardo Barros
2011-03-01 18:20 ` [PATCH 00/24] Refactor sys_swapon Eric B Munson
2011-03-01 23:23 ` Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 " Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 01/24] sys_swapon: use vzalloc instead of vmalloc/memset Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 02/24] sys_swapon: remove changelog from function comment Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 03/24] sys_swapon: do not depend on "type" after allocation Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 04/24] sys_swapon: separate swap_info allocation Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 05/24] sys_swapon: simplify error return from " Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 06/24] sys_swapon: simplify error flow in alloc_swap_info Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 07/24] sys_swapon: remove initial value of name variable Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 08/24] sys_swapon: move setting of error nearer use Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 09/24] sys_swapon: remove did_down variable Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 10/24] sys_swapon: remove bdev variable Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 11/24] sys_swapon: do only cleanup in the cleanup blocks Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 12/24] sys_swapon: use a single error label Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 13/24] sys_swapon: separate bdev claim and inode lock Cesar Eduardo Barros
2011-03-02 21:40 ` Eric B Munson
2011-03-02 23:02 ` Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 14/24] sys_swapon: simplify error flow in claim_swapfile Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 15/24] sys_swapon: move setting of swapfilepages near use Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 16/24] sys_swapon: separate parsing of swapfile header Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 17/24] sys_swapon: simplify error flow in read_swap_header Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 18/24] sys_swapon: call swap_cgroup_swapon earlier Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 19/24] sys_swapon: separate parsing of bad blocks and extents Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 20/24] sys_swapon: simplify error flow in setup_swap_map_and_extents Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 21/24] sys_swapon: remove nr_good_pages variable Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 22/24] sys_swapon: move printk outside lock Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 23/24] sys_swapoff: change order to match sys_swapon Cesar Eduardo Barros
2011-03-01 23:28 ` [PATCHv2 24/24] sys_swapon: separate final enabling of the swapfile Cesar Eduardo Barros
2011-03-02 21:06 ` [PATCHv2 00/24] Refactor sys_swapon Eric B Munson
2011-03-02 21:43 ` Eric B Munson
2011-03-03 16:15 ` Eric B Munson
2011-03-04 22:54 ` Cesar Eduardo Barros
2011-03-04 22:58 ` Eric B Munson
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=1297536565-8059-21-git-send-email-cesarb@cesarb.net \
--to=cesarb@cesarb.net \
--cc=linux-mm@kvack.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