summaryrefslogtreecommitdiffstats
path: root/fs/squashfs
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2010-04-04 22:20:58 +0100
committerPhillip Lougher <phillip@lougher.demon.co.uk>2010-04-23 02:54:54 +0100
commit792590c72376649b4e315df386fd208b83db05b9 (patch)
treefefe4c18d12b4ef9d1977998286da63e93d815b4 /fs/squashfs
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff)
downloadlinux-792590c72376649b4e315df386fd208b83db05b9.tar.gz
linux-792590c72376649b4e315df386fd208b83db05b9.tar.bz2
linux-792590c72376649b4e315df386fd208b83db05b9.zip
squashfs: fix locking bug in zlib wrapper
Fix locking bug in zlib wrapper introduced by recent decompressor changes. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs')
-rw-r--r--fs/squashfs/zlib_wrapper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 15a03d0fb9f3..7a603874e483 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);