Fix missing squashfs_finish_page's

diff --git a/contrib/linux-kernel/fs/squashfs/zstd_wrapper.c b/contrib/linux-kernel/fs/squashfs/zstd_wrapper.c
index af72c7b2239cebc375feeba8587b64d40d8a4d7f..7cc93030bf6626688b6484f6ff841453a3e88290 100644 (file)
--- a/contrib/linux-kernel/fs/squashfs/zstd_wrapper.c
+++ b/contrib/linux-kernel/fs/squashfs/zstd_wrapper.c
@@ -104,6 +104,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
                        if (out_buf.dst == NULL) {
                                /* shouldn't run out of pages before stream is
                                 * done */
+                               squashfs_finish_page(output);
                                goto out;
                        }
                        out_buf.pos = 0;
@@ -118,13 +119,14 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
                        put_bh(bh[k++]);
        } while (zstd_err != 0 && !ZSTD_isError(zstd_err));
 
+       squashfs_finish_page(output);
+
        if (ZSTD_isError(zstd_err)) {
                ERROR("zstd decompression error: %d\n",
                                (int)ZSTD_getErrorCode(zstd_err));
+               goto out;
        }
 
-       squashfs_finish_page(output);
-
        if (k < b)
                goto out;
 

diff --git a/contrib/linux-kernel/squashfs.diff b/contrib/linux-kernel/squashfs.diff
index e3b9e85529f341b04cfc1d26c6848ac96b50fb58..ddf7b35788fce67af6b3af6874307357e2b8a0ee 100644 (file)
--- a/contrib/linux-kernel/squashfs.diff
+++ b/contrib/linux-kernel/squashfs.diff
@@ -1,8 +1,8 @@
-commit 47ba72b36506f91c3774c0bb1fa3c7a5dcfe3ea1
+commit 16bb6b9fd684eadba41a36223d67805d7ea741e7
 Author: Sean Purcell <me@seanp.xyz>
-Date:   Thu Apr 27 16:50:53 2017 -0700
+Date:   Thu Apr 27 17:17:58 2017 -0700
 
-    Add zstd support to kernel squashfs
+    Add zstd support to squashfs
 
 diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig
 index ffb093e..1adb334 100644
@@ -90,10 +90,10 @@ index 506f4ba..24d12fd 100644
        __le32                  s_magic;
 diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c
 new file mode 100644
-index 0000000..af72c7b
+index 0000000..7cc9303
 --- /dev/null
 +++ b/fs/squashfs/zstd_wrapper.c
-@@ -0,0 +1,147 @@
+@@ -0,0 +1,149 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
@@ -200,6 +200,7 @@ index 0000000..af72c7b
 +                      if (out_buf.dst == NULL) {
 +                              /* shouldn't run out of pages before stream is
 +                               * done */
++                              squashfs_finish_page(output);
 +                              goto out;
 +                      }
 +                      out_buf.pos = 0;
@@ -214,13 +215,14 @@ index 0000000..af72c7b
 +                      put_bh(bh[k++]);
 +      } while (zstd_err != 0 && !ZSTD_isError(zstd_err));
 +
++      squashfs_finish_page(output);
++
 +      if (ZSTD_isError(zstd_err)) {
 +              ERROR("zstd decompression error: %d\n",
 +                              (int)ZSTD_getErrorCode(zstd_err));
++              goto out;
 +      }
 +
-+      squashfs_finish_page(output);
-+
 +      if (k < b)
 +              goto out;
 +