ceph: make sure request isn't in any waiting list when kicking request.

[firefly-linux-kernel-4.4.55.git] / fs / squashfs / decompressor_single.c

diff --git a/fs/squashfs/decompressor_single.c b/fs/squashfs/decompressor_single.c
index f857cf6f22d4c4cb24fef3787e7358293c605a0b..a6c75929a00ed22e10e77844aad7a21644f3485c 100644 (file)
--- a/fs/squashfs/decompressor_single.c
+++ b/fs/squashfs/decompressor_single.c
@@ -61,16 +61,15 @@ void squashfs_decompressor_destroy(struct squashfs_sb_info *msblk)
        }
 }
 
-int squashfs_decompress(struct squashfs_sb_info *msblk,
-       void **buffer, struct buffer_head **bh, int b, int offset, int length,
-       int srclength, int pages)
+int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_head **bh,
+       int b, int offset, int length, struct squashfs_page_actor *output)
 {
        int res;
        struct squashfs_stream *stream = msblk->stream;
 
        mutex_lock(&stream->mutex);
-       res = msblk->decompressor->decompress(msblk, stream->stream, buffer,
-               bh, b, offset, length, srclength, pages);
+       res = msblk->decompressor->decompress(msblk, stream->stream, bh, b,
+               offset, length, output);
        mutex_unlock(&stream->mutex);
 
        if (res < 0)