diff options
| author | Chris Mason | 2016-02-17 01:52:10 +0100 |
|---|---|---|
| committer | Chris Mason | 2016-02-17 01:52:10 +0100 |
| commit | 413eddc6ca748dc52057f142d707b9378af692fc (patch) | |
| tree | 0025496d79740f03197c6404c503bc61790745d8 /fs/btrfs | |
| parent | btrfs: properly set the termination value of ctx->pos in readdir (diff) | |
| parent | Btrfs: fix direct IO requests not reporting IO error to user space (diff) | |
| download | kernel-qcow2-linux-413eddc6ca748dc52057f142d707b9378af692fc.tar.gz kernel-qcow2-linux-413eddc6ca748dc52057f142d707b9378af692fc.tar.xz kernel-qcow2-linux-413eddc6ca748dc52057f142d707b9378af692fc.zip | |
Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 600bf0d9ceaf..e0ad8b2c2a36 100644 --- 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); } |