Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 413eddc6 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-chris-4.5' of... 

Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5
parents bc4ef759 1636d1d7

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}