[lc-checkins] CVS: linux/include/linux comp_cache.h,1.81,1.82

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

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

Modified Files:
	comp_cache.h 
Log Message:
Cleanup
o Removed adapt_comp_cache() and all CONFIG_COMP_ADAPTIVITY related stuff.
That will be replaced by growing/shrinking by demand at the moment.


Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** comp_cache.h	20 Jun 2002 12:33:57 -0000	1.81
--- comp_cache.h	20 Jun 2002 14:28:49 -0000	1.82
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-06-20 08:44:35 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-06-20 11:15:27 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 98,111 ****
  
  /* adaptivity.c */
- struct preset_comp_cache {
- 	unsigned int size;
- 	int profit;
- };
- 
- extern struct preset_comp_cache * preset_comp_cache;
- extern int nr_preset_sizes, current_preset_size;
- extern int latest_uncomp_misses[], latest_miss;
- 
- 
  #ifdef CONFIG_COMP_CACHE
  int shrink_comp_cache(struct comp_cache_page *);
--- 98,101 ----
***************
*** 119,123 ****
  /* swapout.c */
  extern struct list_head swp_free_buffer_head;
- extern atomic_t number_of_free_swp_buffers;
  
  /* -- Fragment Flags */
--- 109,112 ----
***************
*** 345,379 ****
  inline int   compress_clean_page(struct page *, unsigned int);
  
- extern int nr_swap_misses;
- extern int nr_compressed_cache_misses;
  extern unsigned long comp_cache_free_space;
- 
  #define comp_cache_used_space  ((num_comp_pages * PAGE_SIZE) - comp_cache_free_space)
- 
- #define add_swap_miss() (nr_swap_misses++)
- #define add_compressed_cache_miss() (nr_compressed_cache_misses++)
- 
  #else
  static inline void comp_cache_init(void) {};
  static inline int  compress_dirty_page(struct page * page, int (*writepage)(struct page *), unsigned int gfp_mask) { return writepage(page); }
  static inline int  compress_clean_page(struct page * page, unsigned int gfp_mask) { return 1; }
- 
- #define add_swap_miss() (0)
- #define add_compressed_cache_miss() (0)
- 
  #endif
  
  #ifdef CONFIG_COMP_PAGE_CACHE
- 
  int  comp_cache_try_to_release_page(struct page **, int);
  void steal_page_from_comp_cache(struct page *, struct page *);
- 
  #else
- 
  static inline int comp_cache_try_to_release_page(struct page ** page, int gfp_mask) { return try_to_release_page(*page, gfp_mask); }
  static inline void steal_page_from_comp_cache(struct page * page, struct page * new_page) {};
- 
  #endif
- 
  
  /* vswap.c */
--- 334,352 ----