[PATCH] mm: clean up local variables

Clean up a local variable with the same name as a variable in a larger
block.  Also move a variable into the block where it's actually used.

Spotted by http://linuxicc.sourceforge.net/

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 6da4b28b896b..80f948a2028b 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1493,7 +1493,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
                         goto bad_swap;
                 if (swap_header->info.nr_badpages > MAX_SWAP_BADPAGES)
                         goto bad_swap;
-                
+
                 /* OK, set up the swap map and apply the bad block list */
                 if (!(p->swap_map = vmalloc(maxpages * sizeof(short)))) {
                         error = -ENOMEM;
@@ -1502,17 +1502,17 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
 
                 error = 0;
                 memset(p->swap_map, 0, maxpages * sizeof(short));
-                for (i=0; i<swap_header->info.nr_badpages; i++) {
-                        int page = swap_header->info.badpages[i];
-                        if (page <= 0 || page >= swap_header->info.last_page)
+                for (i = 0; i < swap_header->info.nr_badpages; i++) {
+                        int page_nr = swap_header->info.badpages[i];
+                        if (page_nr <= 0 || page_nr >= swap_header->info.last_page)
                                 error = -EINVAL;
                         else
-                                p->swap_map[page] = SWAP_MAP_BAD;
+                                p->swap_map[page_nr] = SWAP_MAP_BAD;
                 }
                 nr_good_pages = swap_header->info.last_page -
                                 swap_header->info.nr_badpages -
                                 1 /* header page */;
-                if (error) 
+                if (error)
                         goto bad_swap;
         }