malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: simplify dio_bio_complete

Browse Source 
Only read bio->bi_error once in the common path.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2017-06-03 09:37:59 +02:00 committed by Jens Axboe
parent 4055351cdb
commit d5245d7674
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/direct-io.c
View File

@ -477,13 +477,12 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio)
{ {
struct bio_vec *bvec; struct bio_vec *bvec;
unsigned i; unsigned i;
int err; int err = bio->bi_error;
if (bio->bi_error) if (err)
dio->io_error = -EIO; dio->io_error = -EIO;
if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty) { if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty) {
err = bio->bi_error;
bio_check_pages_dirty(bio); /* transfers ownership */ bio_check_pages_dirty(bio); /* transfers ownership */
} else { } else {
bio_for_each_segment_all(bvec, bio, i) { bio_for_each_segment_all(bvec, bio, i) {
@ -494,7 +493,6 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio)
set_page_dirty_lock(page); set_page_dirty_lock(page);
put_page(page); put_page(page);
} }
err = bio->bi_error;
bio_put(bio); bio_put(bio);
} }
return err; return err;