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

dm: fix REQ_RAHEAD handling

A few (but not all) dm targets use a special EWOULDBLOCK error code for
failing REQ_RAHEAD requests that fail due to a lack of available resources.
But no one else knows about this magic code, and lower level drivers also
don't generate it when failing read-ahead requests for similar reasons.

So remove this special casing and ignore all additional error handling for
REQ_RAHEAD - if this was a real underlying error we'd get a normal read
once the real read comes in.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NBart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: NMike Snitzer <snitzer@redhat.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 f729b66f
...@@ -1214,7 +1214,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio) ...@@ -1214,7 +1214,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio)
*/ */
if (!r || (r == -EWOULDBLOCK)) { if (!r || (r == -EWOULDBLOCK)) {
if (bio->bi_opf & REQ_RAHEAD) if (bio->bi_opf & REQ_RAHEAD)
return -EWOULDBLOCK; return -EIO;
queue_bio(ms, bio, rw); queue_bio(ms, bio, rw);
return DM_MAPIO_SUBMITTED; return DM_MAPIO_SUBMITTED;
...@@ -1258,7 +1258,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error) ...@@ -1258,7 +1258,7 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio, int error)
if (error == -EOPNOTSUPP) if (error == -EOPNOTSUPP)
return error; return error;
if ((error == -EWOULDBLOCK) && (bio->bi_opf & REQ_RAHEAD)) if (bio->bi_opf & REQ_RAHEAD)
return error; return error;
if (unlikely(error)) { if (unlikely(error)) {
......
...@@ -384,7 +384,7 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error) ...@@ -384,7 +384,7 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
if (!error) if (!error)
return 0; /* I/O complete */ return 0; /* I/O complete */
if ((error == -EWOULDBLOCK) && (bio->bi_opf & REQ_RAHEAD)) if (bio->bi_opf & REQ_RAHEAD)
return error; return error;
if (error == -EOPNOTSUPP) if (error == -EOPNOTSUPP)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册