Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason: "My for-linus-4.5 branch has a btrfs DIO error passing fix. I know how much you love DIO, so I'm going to suggest against reading it. We'll follow up with a patch to drop the error arg from dio_end_io in the next merge window." * 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix direct IO requests not reporting IO error to user space
This commit is contained in:
commit
ce6b71432d
|
@ -7986,6 +7986,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)
|
||||
|
@ -8040,6 +8041,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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue