From af26b7aa65aabe747438c3258653ce7220488d70 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Mon, 10 Nov 2008 11:44:58 -0500 Subject: [PATCH] --- yaml --- r: 129006 b: refs/heads/master c: e04ca626baee684bea9d6239e4e1119b696101b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/compression.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1dc10d07a7ef..b4f5fafb50e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff5b7ee33d82414bf4baf299c21fb703bcc89629 +refs/heads/master: e04ca626baee684bea9d6239e4e1119b696101b2 diff --git a/trunk/fs/btrfs/compression.c b/trunk/fs/btrfs/compression.c index 8e7a78acf81a..b582c6fd80f2 100644 --- a/trunk/fs/btrfs/compression.c +++ b/trunk/fs/btrfs/compression.c @@ -505,6 +505,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, struct block_device *bdev; struct bio *comp_bio; u64 cur_disk_byte = (u64)bio->bi_sector << 9; + u64 em_len; + u64 em_start; struct extent_map *em; int ret; @@ -525,7 +527,10 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, cb->start = em->orig_start; compressed_len = em->block_len; + em_len = em->len; + em_start = em->start; free_extent_map(em); + em = NULL; cb->len = uncompressed_len; cb->compressed_len = compressed_len; @@ -543,7 +548,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, } cb->nr_pages = nr_pages; - add_ra_bio_pages(inode, em->start + em->len, cb); + add_ra_bio_pages(inode, em_start + em_len, cb); if (!btrfs_test_opt(root, NODATASUM) && !btrfs_test_flag(inode, NODATASUM)) {