summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/compression.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <anton@tuxera.com>2012-02-27 09:01:22 +0000
committerAnton Altaparmakov <anton@tuxera.com>2012-02-27 09:01:22 +0000
commitf621c5334396fd153cd882ea92466823b7e7b821 (patch)
tree7b829cad44dc0e5003d7cacac3a7a1b128637083 /fs/btrfs/compression.c
parent0afa1b62e33250d4777c5803a98ae69fbe872061 (diff)
parent500dd2370e77c9551ba298bdeeb91b02d8402199 (diff)
downloadop-kernel-dev-f621c5334396fd153cd882ea92466823b7e7b821.zip
op-kernel-dev-f621c5334396fd153cd882ea92466823b7e7b821.tar.gz
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'fs/btrfs/compression.c')
-rw-r--r--fs/btrfs/compression.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 14f1c5a..d02c27c 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -588,6 +588,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
page_offset(bio->bi_io_vec->bv_page),
PAGE_CACHE_SIZE);
read_unlock(&em_tree->lock);
+ if (!em)
+ return -EIO;
compressed_len = em->block_len;
cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);
OpenPOWER on IntegriCloud