Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / squashfs / zlib_wrapper.c

diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 7a603874e483166022a58ee788d0877b99d4505f..4661ae2b1cec8040adcadc4018deb63735309f92 100644 (file)
--- a/fs/squashfs/zlib_wrapper.c
+++ b/fs/squashfs/zlib_wrapper.c
@@ -29,7 +29,6 @@
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"
-#include "squashfs_fs_i.h"
 #include "squashfs.h"
 #include "decompressor.h"
 
@@ -66,8 +65,8 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
        struct buffer_head **bh, int b, int offset, int length, int srclength,
        int pages)
 {
-       int zlib_err = 0, zlib_init = 0;
-       int avail, bytes, k = 0, page = 0;
+       int zlib_err, zlib_init = 0;
+       int k = 0, page = 0;
        z_stream *stream = msblk->stream;
 
        mutex_lock(&msblk->read_data_mutex);
@@ -75,21 +74,14 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
        stream->avail_out = 0;
        stream->avail_in = 0;
 
-       bytes = length;
        do {
                if (stream->avail_in == 0 && k < b) {
-                       avail = min(bytes, msblk->devblksize - offset);
-                       bytes -= avail;
+                       int avail = min(length, msblk->devblksize - offset);
+                       length -= avail;
                        wait_on_buffer(bh[k]);
                        if (!buffer_uptodate(bh[k]))
                                goto release_mutex;
 
-                       if (avail == 0) {
-                               offset = 0;
-                               put_bh(bh[k++]);
-                               continue;
-                       }
-
                        stream->next_in = bh[k]->b_data + offset;
                        stream->avail_in = avail;
                        offset = 0;
@@ -128,6 +120,11 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
                goto release_mutex;
        }
 
+       if (k < b) {
+               ERROR("zlib_uncompress error, data remaining\n");
+               goto release_mutex;
+       }
+
        length = stream->total_out;
        mutex_unlock(&msblk->read_data_mutex);
        return length;