[lc-checkins] CVS: linux/include/linux comp_cache.h,1.55,1.56 swap.h,1.13,1.14

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

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

Modified Files:
	comp_cache.h swap.h 
Log Message:
- Clean pages support in compressed cache is improved even more.

- Clean and dirty pages are only removed from the compressed cache
when writeout_fragments() is called or the program exits.

- removed an obsolete code for CONFIG_COMP_SWAP

- improved writeout_fragments(), which will try to free fragments even
if we can't perform IO. In this case, we will free only clean
fragments.



Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** comp_cache.h	26 Feb 2002 20:59:01 -0000	1.55
--- comp_cache.h	27 Feb 2002 14:16:52 -0000	1.56
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-02-26 13:48:02 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-02-26 19:25:16 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 288,292 ****
  #ifdef CONFIG_COMP_CACHE
  int  lookup_comp_cache(struct address_space *, unsigned long, struct page *);
! void invalidate_comp_page(struct address_space *, unsigned long, struct page *);
  void invalidate_comp_pages(struct address_space *);
  void truncate_comp_pages(struct address_space *, unsigned long, unsigned);
--- 288,293 ----
  #ifdef CONFIG_COMP_CACHE
  int  lookup_comp_cache(struct address_space *, unsigned long, struct page *);
! void invalidate_comp_cache(struct address_space *, unsigned long);
! void clear_comp_page(struct address_space *, unsigned long, struct page *);
  void invalidate_comp_pages(struct address_space *);
  void truncate_comp_pages(struct address_space *, unsigned long, unsigned);
***************
*** 295,299 ****
  #else
  static inline int  lookup_comp_cache(struct address_space * mapping, unsigned long offset, struct page * page) { return -ENOENT; }
! static inline void invalidate_comp_page(struct address_space * mapping, unsigned long offset, struct page * page) { };
  static inline void invalidate_comp_pages(struct address_space * mapping) { };
  static inline void truncate_comp_pages(struct address_space * mapping, unsigned long start, unsigned partial) { };
--- 296,301 ----
  #else
  static inline int  lookup_comp_cache(struct address_space * mapping, unsigned long offset, struct page * page) { return -ENOENT; }
! static inline void invalidate_comp_cache(struct address_space * mapping, unsigned long offset) { };
! static inline void clear_comp_page(struct address_space * mapping, unsigned long offset, struct page * page) { };
  static inline void invalidate_comp_pages(struct address_space * mapping) { };
  static inline void truncate_comp_pages(struct address_space * mapping, unsigned long start, unsigned partial) { };

Index: swap.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/swap.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** swap.h	13 Dec 2001 19:12:57 -0000	1.13
--- swap.h	27 Feb 2002 14:16:52 -0000	1.14
***************
*** 79,85 ****
  	struct vfsmount *swap_vfsmnt;
  	unsigned short * swap_map;
- #ifdef CONFIG_COMP_SWAP
- 	unsigned short * swap_comp;
- #endif
  	unsigned int lowest_bit;
  	unsigned int highest_bit;
--- 79,82 ----