From: Phillip Lougher Date: Sun, 4 Apr 2010 21:20:58 +0000 (+0100) Subject: squashfs: fix locking bug in zlib wrapper X-Git-Tag: v2.6.34-rc6~24^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=792590c72376649b4e315df386fd208b83db05b9;p=~shefty%2Frdma-dev.git squashfs: fix locking bug in zlib wrapper Fix locking bug in zlib wrapper introduced by recent decompressor changes. Signed-off-by: Phillip Lougher --- diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 15a03d0fb9f..7a603874e48 100644 --- a/fs/squashfs/zlib_wrapper.c +++ b/fs/squashfs/zlib_wrapper.c @@ -128,8 +128,9 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer, goto release_mutex; } + length = stream->total_out; mutex_unlock(&msblk->read_data_mutex); - return stream->total_out; + return length; release_mutex: mutex_unlock(&msblk->read_data_mutex);