[lc-checkins] CVS: linux/include/linux comp_cache.h,1.86,1.87

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

Update of /cvsroot/linuxcompressed/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv27959/include/linux

Modified Files:
	comp_cache.h 
Log Message:
Bug fixes
o Fixed potential oops in __read_cache_page() due to a misplaced
steal_page_from_comp_cache() call.
o Fixed bug in __read_swap_cache_async() which would end up getting an
extra reference on a swap cache page and would also erroneously stop a
swapin readahead.
o Fixed major bug in shrink_cache() that could hang the machine. We
could write a page in compress_dirty_page() even if the GFP mask does
not allow!

Cleanups
o Added #ifdefs to some flush_comp_cache() calls.
o Replaced find_comp_page() in do_swap_page() by a in_comp_cache()
call.

Other 
o Added page count check to shrink_comp_cache(). Only to make sure the
page is going to be actually freed.
o Removed write permission from /proc/sys/vm/comp_cache/size when
resize on demand option is enabled.



Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** comp_cache.h	1 Jul 2002 18:44:40 -0000	1.86
--- comp_cache.h	5 Jul 2002 15:21:49 -0000	1.87
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-07-01 15:29:46 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-07-05 11:51:59 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 29,33 ****
  #include <linux/WKcommon.h>
  
! #define COMP_CACHE_VERSION "0.23pre8"
  
  /* maximum compressed size of a page */
--- 29,33 ----
  #include <linux/WKcommon.h>
  
! #define COMP_CACHE_VERSION "0.23pre9"
  
  /* maximum compressed size of a page */
***************
*** 553,558 ****
  /* enough memory functions */
  #ifdef CONFIG_COMP_CACHE
- inline int in_comp_cache(struct address_space *, unsigned long);
  extern int FASTCALL(find_comp_page(struct address_space *, unsigned long, struct comp_cache_fragment **));
  #else
  static inline int find_comp_page(struct address_space * mapping, unsigned long offset, struct comp_cache_fragment ** fragment) { return -ENOENT; }
--- 553,558 ----
  /* enough memory functions */
  #ifdef CONFIG_COMP_CACHE
  extern int FASTCALL(find_comp_page(struct address_space *, unsigned long, struct comp_cache_fragment **));
+ inline int in_comp_cache(struct address_space *, unsigned long);
  #else
  static inline int find_comp_page(struct address_space * mapping, unsigned long offset, struct comp_cache_fragment ** fragment) { return -ENOENT; }