updated version of zram-do-not-use-copy_page-with-non-page-aligned-address.patch

diff --git a/queue-4.10/series b/queue-4.10/series
index 4d6ea5260207be0043f650c92c64bc7259b88bec..e63ef201ab4b2bc9123e384d09ac2a782e07fc26 100644 (file)
--- a/queue-4.10/series
+++ b/queue-4.10/series
@@ -5,7 +5,6 @@ tcmu-fix-wrongly-calculating-of-the-base_command_size.patch
 tcmu-skip-data-out-blocks-before-gathering-data-in-buffer-for-bidi-case.patch
 thp-fix-madv_dontneed-vs.-madv_free-race.patch
 thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch
-zram-do-not-use-copy_page-with-non-page-aligned-address.patch
 zsmalloc-expand-class-bit.patch
 orangefs-free-superblock-when-mount-fails.patch
 drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch
@@ -52,3 +51,4 @@ ftrace-fix-removing-of-second-function-probe.patch
 drm-i915-gvt-set-the-correct-default-value-of-ctx-status-ptr.patch
 char-lack-of-bool-string-made-config_devport-always-on.patch
 revert-mips-lantiq-fix-cascaded-irq-setup.patch
+zram-do-not-use-copy_page-with-non-page-aligned-address.patch

diff --git a/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch b/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
index 0a4514a71c37e2ac2cc42587ac695baae2d8d6c9..e1dd8b43b8b4be3a620955837be41afec74220fb 100644 (file)
--- a/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
+++ b/queue-4.10/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
@@ -42,12 +42,19 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/block/zram/zram_drv.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/block/zram/zram_drv.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- a/drivers/block/zram/zram_drv.c
 +++ b/drivers/block/zram/zram_drv.c
-@@ -589,7 +589,7 @@ static int zram_decompress_page(struct z
+@@ -583,13 +583,13 @@ static int zram_decompress_page(struct z
+ 
+       if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) {
+               bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
+-              clear_page(mem);
++              memset(mem, 0, PAGE_SIZE);
+               return 0;
+       }
  
        cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO);
        if (size == PAGE_SIZE) {

diff --git a/queue-4.9/series b/queue-4.9/series
index a5b5b0b5bbc7fa2c812152fbb43848863cbd9707..8bf622bc949d0411bbc7dc13f97aed5e7afba5e3 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -4,7 +4,6 @@ tcmu-fix-wrongly-calculating-of-the-base_command_size.patch
 tcmu-skip-data-out-blocks-before-gathering-data-in-buffer-for-bidi-case.patch
 thp-fix-madv_dontneed-vs.-madv_free-race.patch
 thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch
-zram-do-not-use-copy_page-with-non-page-aligned-address.patch
 zsmalloc-expand-class-bit.patch
 orangefs-free-superblock-when-mount-fails.patch
 drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch
@@ -44,3 +43,4 @@ ftrace-fix-removing-of-second-function-probe.patch
 char-lack-of-bool-string-made-config_devport-always-on.patch
 revert-mips-lantiq-fix-cascaded-irq-setup.patch
 kvm-fix-page-struct-leak-in-handle_vmon.patch
+zram-do-not-use-copy_page-with-non-page-aligned-address.patch

diff --git a/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch b/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
index 508042636ec2e36703d6ae96ca42082bea30fa71..bfe5abe41a9f0be3e4f875c4b921a4e6abf2b3cf 100644 (file)
--- a/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
+++ b/queue-4.9/zram-do-not-use-copy_page-with-non-page-aligned-address.patch
@@ -41,13 +41,21 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
+
 ---
- drivers/block/zram/zram_drv.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ drivers/block/zram/zram_drv.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- a/drivers/block/zram/zram_drv.c
 +++ b/drivers/block/zram/zram_drv.c
-@@ -588,7 +588,7 @@ static int zram_decompress_page(struct z
+@@ -582,13 +582,13 @@ static int zram_decompress_page(struct z
+ 
+       if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) {
+               bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
+-              clear_page(mem);
++              memset(mem, 0, PAGE_SIZE);
+               return 0;
+       }
  
        cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO);
        if (size == PAGE_SIZE) {