zygo: silence the common EIO

(cherry picked from commit 449e919f179446cec404f3c2e668117e4871082b)

diff --git a/.config b/.config
index e3ec70d6ffa375ad1a6e477ad167d49f1b363236..a548cd8c3d8b3a0801af5d630b1cfe50bfdaa8c6 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.0.0 Kernel Configuration
+# Linux/x86_64 4.0.0-zb64 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 4afdde1ca06c26429cfca1f623c5a818818f9ee6..64bb13aa7593ad0c7d8ed199ca44204e125d2d9e 100644 (file)
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -89,6 +89,7 @@ static int zlib_compress_pages(struct list_head *ws,
        struct page *in_page = NULL;
        struct page *out_page = NULL;
        unsigned long bytes_left;
+       unsigned long saved_avail_in;
 
        *out_pages = 0;
        *total_out = 0;
@@ -181,12 +182,14 @@ static int zlib_compress_pages(struct list_head *ws,
                        workspace->strm.next_in = data_in;
                }
        }
+       saved_avail_in = workspace->strm.avail_in;
        workspace->strm.avail_in = 0;
        ret = zlib_deflate(&workspace->strm, Z_FINISH);
        zlib_deflateEnd(&workspace->strm);
 
        if (ret != Z_STREAM_END) {
-               ret = -EIEIO;
+               printk(KERN_DEBUG "%s: ret = %d, strm.avail_in = %lu, strm.avail_out = %lu, max_out = %lu, nr_pages = %d, nr_dest_pages = %lu\n", __FUNCTION__, ret, saved_avail_in, workspace->strm.avail_out, max_out, nr_pages, nr_dest_pages);
+               ret = -EIO;
                goto out;
        }