diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-01-05 17:52:26 +0000 |
|---|---|---|
| committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-01-13 21:20:52 +0000 |
| commit | 170cf02165272dfe026eba183563bad973ca4f05 (patch) | |
| tree | ac67de416d11ba535909d982fcfd4d68d21c3551 /fs/squashfs | |
| parent | 7a43ae523744c01b6187013e781f44c2281c579c (diff) | |
| download | linux-3.10-170cf02165272dfe026eba183563bad973ca4f05.tar.gz linux-3.10-170cf02165272dfe026eba183563bad973ca4f05.tar.bz2 linux-3.10-170cf02165272dfe026eba183563bad973ca4f05.zip | |
Squashfs: remove unnecessary variable in zlib_wrapper
Get rid of unnecessary bytes variable, and remove redundant
initialisation of zlib_err.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/zlib_wrapper.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 7a603874e48..1f4833b87ea 100644 --- a/fs/squashfs/zlib_wrapper.c +++ b/fs/squashfs/zlib_wrapper.c @@ -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, 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,11 +75,10 @@ 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; |