tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ce6b7143 87d9ac71

+2
+2
fs/btrfs/inode.c
··· 7986 7986 7987 7987 kfree(dip); 7988 7988 7989 + dio_bio->bi_error = bio->bi_error; 7989 7990 dio_end_io(dio_bio, bio->bi_error); 7990 7991 7991 7992 if (io_bio->end_io) ··· 8041 8040 8042 8041 kfree(dip); 8043 8042 8043 + dio_bio->bi_error = bio->bi_error; 8044 8044 dio_end_io(dio_bio, bio->bi_error); 8045 8045 bio_put(bio); 8046 8046 }