projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
compression.c
diff --git
a/fs/btrfs/compression.c
b/fs/btrfs/compression.c
index c473c42d7d6c4d559dbe1587491cd2fb93804145..bae05c5c75bad4c7f3f8ac74fb38e0b3dca460ac 100644
(file)
--- a/
fs/btrfs/compression.c
+++ b/
fs/btrfs/compression.c
@@
-694,7
+694,7
@@
int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, READ, comp_bio,
mirror_num, 0);
if (ret) {
ret = btrfs_map_bio(root, READ, comp_bio,
mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+
comp_
bio->bi_error = ret;
bio_endio(comp_bio);
}
bio_endio(comp_bio);
}
@@
-723,7
+723,7
@@
int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);
if (ret) {
ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);
if (ret) {
- bio->bi_error = ret;
+
comp_
bio->bi_error = ret;
bio_endio(comp_bio);
}
bio_endio(comp_bio);
}