[lc-checkins] CVS: linux/fs/proc proc_misc.c,1.3,1.4

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/fs/proc
In directory usw-pr-cvs1:/tmp/cvs-serv11239/fs/proc

Modified Files:
	proc_misc.c 
Log Message:
- Fix meminfo output when compressed cache is enabled. Thus, cached memory
and swap cached memory actually corresponds to the cache and swap cached
memory in non-compressed cache. Besides, adds two lines to its output with
information about compressed cache memory consumption like how much memory
was reserved and how much is being used at that moment.



Index: proc_misc.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/fs/proc/proc_misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** proc_misc.c	13 Dec 2001 19:12:57 -0000	1.3
--- proc_misc.c	15 May 2002 18:05:35 -0000	1.4
***************
*** 164,167 ****
--- 164,171 ----
  		"Buffers:      %8lu kB\n"
  		"Cached:       %8lu kB\n"
+ #ifdef CONFIG_COMP_CACHE
+ 		"CCacheAlloc:  %8lu kB\n"
+ 		"CCacheUsed:   %8lu kB\n"
+ #endif
  		"SwapCached:   %8lu kB\n"
  		"Active:       %8u kB\n"
***************
*** 177,182 ****
--- 181,193 ----
  		K(i.sharedram),
  		K(i.bufferram),
+ #ifdef CONFIG_COMP_CACHE
+ 		K(pg_size + num_swapper_fragments - swapper_space.nrpages),
+ 		K(num_comp_pages),
+ 		comp_cache_used_space/1024,
+ 		K(swapper_space.nrpages - num_swapper_fragments),
+ #else
  		K(pg_size - swapper_space.nrpages),
  		K(swapper_space.nrpages),
+ #endif
  		K(nr_active_pages),
  		K(nr_inactive_pages),