Merge 2.6.38-rc5 into staging-next

This is to resolve a merge conflict with:
	drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 1017d6df17d..5fdf9d2fc95 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -230,6 +230,7 @@ static void zram_read(struct zram *zram, struct bio *bio)
 
                 if (zram_test_flag(zram, index, ZRAM_ZERO)) {
                         handle_zero_page(page);
+                        index++;
                         continue;
                 }
 
@@ -238,12 +239,14 @@ static void zram_read(struct zram *zram, struct bio *bio)
                         pr_debug("Read before write: sector=%lu, size=%u",
                                 (ulong)(bio->bi_sector), bio->bi_size);
                         handle_zero_page(page);
+                        index++;
                         continue;
                 }
 
                 /* Page is stored uncompressed since it's incompressible */
                 if (unlikely(zram_test_flag(zram, index, ZRAM_UNCOMPRESSED))) {
                         handle_uncompressed_page(zram, page, index);
+                        index++;
                         continue;
                 }
 
@@ -322,6 +325,7 @@ static void zram_write(struct zram *zram, struct bio *bio)
                         mutex_unlock(&zram->lock);
                         zram_stat_inc(&zram->stats.pages_zero);
                         zram_set_flag(zram, index, ZRAM_ZERO);
+                        index++;
                         continue;
                 }