提交 d5245d76 编写于 作者: C Christoph Hellwig 提交者: Jens Axboe

fs: simplify dio_bio_complete

Only read bio->bi_error once in the common path.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NBart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 4055351c
...@@ -477,13 +477,12 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册