---

yaml --- r: 186607 b: refs/heads/master c: ef4ffb7 h: refs/heads/master i: 186605: 2ab8212 186603: b4c249f 186599: c253514 186591: 751ebb1 v: v3
git-mirror · Mar 4, 2010 · b5f2c94 · b5f2c94
1 parent da5b01c
commit b5f2c94
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2141ec629c9c9a70c905cfebcc8fa69373dd982a
+refs/heads/master: ef4ffb7ade54f7669172cf5cead69695e588c06a
diff --git a/trunk/drivers/staging/ramzswap/Kconfig b/trunk/drivers/staging/ramzswap/Kconfig
@@ -5,7 +5,7 @@ config RAMZSWAP
 	select LZO_DECOMPRESS
 	default n
 	help
-	  Creates virtual block devices which can be used (only) as a swap
+	  Creates virtual block devices which can (only) be used as swap
 	  disks. Pages swapped to these disks are compressed and stored in
 	  memory itself.
 

diff --git a/trunk/drivers/staging/ramzswap/ramzswap.txt b/trunk/drivers/staging/ramzswap/ramzswap.txt
@@ -5,9 +5,9 @@ Project home: http://compcache.googlecode.com/
 
 * Introduction
 
-It creates RAM based block devices which can be used (only) as swap disks.
-Pages swapped to these devices are compressed and stored in memory itself.
-See project home for use cases, performance numbers and a lot more.
+The ramzswap module creates RAM based block devices which can (only) be used as
+swap disks. Pages swapped to these devices are compressed and stored in memory
+itself. See project home for use cases, performance numbers and a lot more.
 
 Individual ramzswap devices are configured and initialized using rzscontrol
 userspace utility as shown in examples below. See rzscontrol man page for more

diff --git a/trunk/drivers/staging/ramzswap/ramzswap_drv.c b/trunk/drivers/staging/ramzswap/ramzswap_drv.c
@@ -730,7 +730,7 @@ static int ramzswap_read(struct ramzswap *rzs, struct bio *bio)
 	if (!rzs->table[index].page)
 		return handle_ramzswap_fault(rzs, bio);
 
-	/* Page is stored uncompressed since its incompressible */
+	/* Page is stored uncompressed since it's incompressible */
 	if (unlikely(rzs_test_flag(rzs, index, RZS_UNCOMPRESSED)))
 		return handle_uncompressed_page(rzs, bio);
 
@@ -792,7 +792,7 @@ static int ramzswap_write(struct ramzswap *rzs, struct bio *bio)
 		ramzswap_free_page(rzs, index);
 
 	/*
-	 * No memory ia allocated for zero filled pages.
+	 * No memory is allocated for zero filled pages.
 	 * Simply clear zero page flag.
 	 */
 	if (rzs_test_flag(rzs, index, RZS_ZERO)) {

diff --git a/trunk/drivers/staging/ramzswap/ramzswap_drv.h b/trunk/drivers/staging/ramzswap/ramzswap_drv.h
@@ -102,7 +102,7 @@ struct table {
 	u16 offset;
 	u8 count;	/* object ref count (not yet used) */
 	u8 flags;
-} __attribute__((aligned(4)));;
+} __attribute__((aligned(4)));
 
 /*
  * Swap extent information in case backing swap is a regular
@@ -121,8 +121,8 @@ struct ramzswap_stats {
 #if defined(CONFIG_RAMZSWAP_STATS)
 	u64 num_reads;		/* failed + successful */
 	u64 num_writes;		/* --do-- */
-	u64 failed_reads;	/* can happen when memory is too low */
-	u64 failed_writes;	/* should NEVER! happen */
+	u64 failed_reads;	/* should NEVER! happen */
+	u64 failed_writes;	/* can happen when memory is too low */
 	u64 invalid_io;		/* non-swap I/O requests */
 	u32 pages_zero;		/* no. of zero filled pages */
 	u32 pages_stored;	/* no. of pages currently stored */

diff --git a/trunk/drivers/staging/ramzswap/ramzswap_ioctl.h b/trunk/drivers/staging/ramzswap/ramzswap_ioctl.h
@@ -24,8 +24,8 @@ struct ramzswap_ioctl_stats {
 				 * size (if present) */
 	u64 num_reads;		/* failed + successful */
 	u64 num_writes;		/* --do-- */
-	u64 failed_reads;	/* can happen when memory is too low */
-	u64 failed_writes;	/* should NEVER! happen */
+	u64 failed_reads;	/* should NEVER! happen */
+	u64 failed_writes;	/* can happen when memory is too low */
 	u64 invalid_io;		/* non-swap I/O requests */
 	u32 pages_zero;		/* no. of zero filled pages */
 	u32 good_compress_pct;	/* no. of pages with compression ratio<=50% */

diff --git a/trunk/drivers/staging/ramzswap/xvmalloc.c b/trunk/drivers/staging/ramzswap/xvmalloc.c
@@ -273,7 +273,7 @@ static void remove_block(struct xv_pool *pool, struct page *page, u32 offset,
 }
 
 /*
- * Allocate a page and add it freelist of given pool.
+ * Allocate a page and add it to freelist of given pool.
  */
 static int grow_pool(struct xv_pool *pool, gfp_t flags)
 {

diff --git a/trunk/drivers/staging/ramzswap/xvmalloc_int.h b/trunk/drivers/staging/ramzswap/xvmalloc_int.h
@@ -62,7 +62,7 @@ struct link_free {
 
 struct block_header {
 	union {
-		/* This common header must be ALIGN bytes */
+		/* This common header must be XV_ALIGN bytes */
 		u8 common[XV_ALIGN];
 		struct {
 			u16 size;
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     /*
-     * Allocate a page and add it freelist of given pool.
+     * Allocate a page and add it to freelist of given pool.
      */
     static int grow_pool(struct xv_pool *pool, gfp_t flags)
     {
@@ Expand Down @@