diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 10:51:26 -0400 |
| commit | 69dbdd819599e2f3b77c172e83af512845bca5ad (patch) | |
| tree | 49939d8b80ec2115a801eae2aebc21f23867c876 /fs/btrfs/compression.c | |
| parent | 87232dd49aeb6b7d1af291edca8bd129a82ef4b5 (diff) | |
| parent | 75e3f3137cb570661c2ad3035a139dda671fbb63 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 396039b3a8a2..7845d1f7d1d9 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c | |||
| @@ -163,7 +163,6 @@ fail: | |||
| 163 | */ | 163 | */ |
| 164 | static void end_compressed_bio_read(struct bio *bio, int err) | 164 | static void end_compressed_bio_read(struct bio *bio, int err) |
| 165 | { | 165 | { |
| 166 | struct extent_io_tree *tree; | ||
| 167 | struct compressed_bio *cb = bio->bi_private; | 166 | struct compressed_bio *cb = bio->bi_private; |
| 168 | struct inode *inode; | 167 | struct inode *inode; |
| 169 | struct page *page; | 168 | struct page *page; |
| @@ -187,7 +186,6 @@ static void end_compressed_bio_read(struct bio *bio, int err) | |||
| 187 | /* ok, we're the last bio for this extent, lets start | 186 | /* ok, we're the last bio for this extent, lets start |
| 188 | * the decompression. | 187 | * the decompression. |
| 189 | */ | 188 | */ |
| 190 | tree = &BTRFS_I(inode)->io_tree; | ||
| 191 | ret = btrfs_zlib_decompress_biovec(cb->compressed_pages, | 189 | ret = btrfs_zlib_decompress_biovec(cb->compressed_pages, |
| 192 | cb->start, | 190 | cb->start, |
| 193 | cb->orig_bio->bi_io_vec, | 191 | cb->orig_bio->bi_io_vec, |
