[lc-checkins] CVS: linux26/include/linux ccache.h, 1.6, 1.7 page-flags.h, 1.7, 1.8 sysctl.h, 1.1, 1.2

[Nitin G. <nit...@us...>]

Update of /cvsroot/linuxcompressed/linux26/include/linux
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5254/include/linux

Modified Files:
	ccache.h page-flags.h sysctl.h 
Log Message:
kernel 2.6.17.1: vswap stable. Started work on add_to_ccache() and friends

Index: ccache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/include/linux/ccache.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ccache.h	15 Jun 2006 10:24:06 -0000	1.6
--- ccache.h	21 Jun 2006 17:12:47 -0000	1.7
***************
*** 16,19 ****
--- 16,23 ----
  #define MAX_SWAP_OFFSET		(1 << MAX_SWAP_OFFSET_SHIFT)
  
+ /* Error codes */
+ #define CC_ENOMEM	1
+ #define CC_EUSED	2
+ 
  extern unsigned long max_anon_cc_size, max_fs_backed_cc_size;
  
***************
*** 31,35 ****
  struct chunk_head {
  	unsigned long flags;	/* compression algo used, no. of chunks etc. */
! 	atomic_t count;		/* usage count; free this struct
  				 * when count is 0 */
  	struct chunk *chunk_list;	/* point to first chunk */
--- 35,39 ----
  struct chunk_head {
  	unsigned long flags;	/* compression algo used, no. of chunks etc. */
! 	atomic_t _count;		/* usage count; free this struct
  				 * when count is 0 */
  	struct chunk *chunk_list;	/* point to first chunk */
***************
*** 49,52 ****
--- 53,57 ----
  extern int set_anon_cc_size(unsigned long size);
  extern int should_add_to_ccache(struct page *page);
+ extern int add_to_ccache(struct page *page);
  extern int sysctl_max_anon_cc_size(ctl_table *table, int write,
  	struct file *file, void __user *buffer, size_t *length, loff_t *ppos);

Index: page-flags.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/include/linux/page-flags.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** page-flags.h	21 Jun 2006 11:13:08 -0000	1.7
--- page-flags.h	21 Jun 2006 17:12:47 -0000	1.8
***************
*** 91,96 ****
  #define PG_uncached		20	/* Page has been mapped as uncached */
  
! #define PG_will_compress	21
! #define PG_compressed		22
  
  /*
--- 91,96 ----
  #define PG_uncached		20	/* Page has been mapped as uncached */
  
! #define PG_will_compress        21	/* going, going.... */
! #define PG_compressed           22	/* gone! */
  
  /*
***************
*** 225,240 ****
   * Manipulation of page state flags
   */
! #define PageWillCompress(page)		\
                  test_bit(PG_will_compress, &(page)->flags)
! #define SetPageWillCompress(page)	\
                  set_bit(PG_will_compress, &(page)->flags)
! #define ClearPageWillCompress(page)	\
                  clear_bit(PG_will_compress, &(page)->flags)
  
! #define PageCompressed(page)		\
                  test_bit(PG_compressed, &(page)->flags)
! #define SetPageCompressed(page)		\
                  set_bit(PG_compressed, &(page)->flags)
! #define ClearPageCompressed(page)	\
                  clear_bit(PG_compressed, &(page)->flags)
  
--- 225,240 ----
   * Manipulation of page state flags
   */
! #define PageWillCompress(page)          \
                  test_bit(PG_will_compress, &(page)->flags)
! #define SetPageWillCompress(page)       \
                  set_bit(PG_will_compress, &(page)->flags)
! #define ClearPageWillCompress(page)     \
                  clear_bit(PG_will_compress, &(page)->flags)
  
! #define PageCompressed(page)            \
                  test_bit(PG_compressed, &(page)->flags)
! #define SetPageCompressed(page)         \
                  set_bit(PG_compressed, &(page)->flags)
! #define ClearPageCompressed(page)       \
                  clear_bit(PG_compressed, &(page)->flags)
  

Index: sysctl.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux26/include/linux/sysctl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sysctl.h	15 Jun 2006 10:24:07 -0000	1.1
--- sysctl.h	21 Jun 2006 17:12:47 -0000	1.2
***************
*** 187,191 ****
  	VM_ZONE_RECLAIM_MODE=31, /* reclaim local zone memory before going off node */
  	VM_ZONE_RECLAIM_INTERVAL=32, /* time period to wait after reclaim failure */
! 	VM_MAX_ANON_CC_SIZE=33,	/* max size for compressed cache for anonymous pages */
  };
  
--- 187,191 ----
  	VM_ZONE_RECLAIM_MODE=31, /* reclaim local zone memory before going off node */
  	VM_ZONE_RECLAIM_INTERVAL=32, /* time period to wait after reclaim failure */
! 	VM_MAX_ANON_CC_SIZE=33, /* max size for compressed cache for anonymous pages */
  };