Update of /cvsroot/linuxcompressed/linux26/mm
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24075/mm
Modified Files:
swapfile.c
Log Message:
vswap now doesnt crash. No de/compression. Interfaces now via sysctl so cc_control module not reqd now.
Index: swapfile.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/mm/swapfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** swapfile.c 11 Jun 2006 20:03:48 -0000 1.4
--- swapfile.c 15 Jun 2006 10:24:07 -0000 1.5
***************
*** 1404,1409 ****
struct swap_extent *new_se;
- pr_info("set_anon_cc_size called\n");
-
error=0;
spin_lock(&swap_lock);
--- 1404,1407 ----
***************
*** 1431,1435 ****
p->inuse_pages = 0;
p->max = maxpages;
! p->pages = maxpages - 1; // --------------
p->cluster_next = 1;
p->prio = 100;
--- 1429,1433 ----
p->inuse_pages = 0;
p->max = maxpages;
! p->pages = maxpages - 1;
p->cluster_next = 1;
p->prio = 100;
***************
*** 1437,1441 ****
spin_unlock(&swap_lock);
-
/* initialize swap map */
if (!(p->swap_map = vmalloc(maxpages * sizeof(short)))) {
--- 1435,1438 ----
***************
*** 1459,1468 ****
p->curr_swap_extent = new_se;
-
mutex_lock(&swapon_mutex);
spin_lock(&swap_lock);
p->flags = SWP_ACTIVE | SWP_COMPRESSED;
! nr_swap_pages += maxpages - 1; // --------------
! total_swap_pages += maxpages - 1; // ------------------
/* insert swap space into swap_list */
--- 1456,1464 ----
p->curr_swap_extent = new_se;
mutex_lock(&swapon_mutex);
spin_lock(&swap_lock);
p->flags = SWP_ACTIVE | SWP_COMPRESSED;
! nr_swap_pages += maxpages - 1;
! total_swap_pages += maxpages - 1;
/* insert swap space into swap_list */
***************
*** 1486,1490 ****
out:
! pr_info("Error initializing anon compressed swap.\n");
return error;
}
--- 1482,1486 ----
out:
! printk(KERN_WARNING "Error initializing anon compressed swap.\n");
return error;
}
|
