Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/fdmanana/linux into for-linus-4.5
mariux64 · Feb 17, 2016 · 413eddc · 413eddc
2 parents bc4ef75 + 1636d1d
commit 413eddc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -7985,6 +7985,7 @@ static void btrfs_endio_direct_read(struct bio *bio)
 
 	kfree(dip);
 
+	dio_bio->bi_error = bio->bi_error;
 	dio_end_io(dio_bio, bio->bi_error);
 
 	if (io_bio->end_io)
@@ -8039,6 +8040,7 @@ static void btrfs_endio_direct_write(struct bio *bio)
 
 	kfree(dip);
 
+	dio_bio->bi_error = bio->bi_error;
 	dio_end_io(dio_bio, bio->bi_error);
 	bio_put(bio);
 }