lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Squashfs: remove unnecessary variable in zlib_wrapper

Browse Source 
Get rid of unnecessary bytes variable, and remove redundant
initialisation of zlib_err.

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
This commit is contained in:
Phillip Lougher
2011-01-05 17:52:26 +00:00
parent 7a43ae5237
commit 170cf02165
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/squashfs/zlib_wrapper.c
View File

@@ -66,8 +66,8 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
struct buffer_head **bh, int b, int offset, int length, int srclength, struct buffer_head **bh, int b, int offset, int length, int srclength,
int pages) int pages)
{ {
int zlib_err = 0, zlib_init = 0; int zlib_err, zlib_init = 0;
int avail, bytes, k = 0, page = 0; int k = 0, page = 0;
z_stream *stream = msblk->stream; z_stream *stream = msblk->stream;
mutex_lock(&msblk->read_data_mutex); mutex_lock(&msblk->read_data_mutex);
@@ -75,11 +75,10 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
stream->avail_out = 0; stream->avail_out = 0;
stream->avail_in = 0; stream->avail_in = 0;
bytes = length;
do { do {
if (stream->avail_in == 0 && k < b) { if (stream->avail_in == 0 && k < b) {
avail = min(bytes, msblk->devblksize - offset); int avail = min(length, msblk->devblksize - offset);
bytes -= avail; length -= avail;
wait_on_buffer(bh[k]); wait_on_buffer(bh[k]);
if (!buffer_uptodate(bh[k])) if (!buffer_uptodate(bh[k]))
goto release_mutex; goto release_mutex;