On 12/13/18 1:53 PM, Goldwyn Rodrigues wrote:
For AIO+DIO with RWF_NOWAIT, if the block layer does not support REQ_NOWAIT,
it returns EIO. Return EOPNOTSUPP to represent the correct error code.
Cc: stable@?
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
---
fs/direct-io.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 41a0e97252ae..77adf33916b8 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -542,10 +542,13 @@ static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio)
blk_status_t err = bio->bi_status;
if (err) {
- if (err == BLK_STS_AGAIN && (bio->bi_opf & REQ_NOWAIT))
- dio->io_error = -EAGAIN;
- else
- dio->io_error = -EIO;
+ dio->io_error = -EIO;
+ if (bio->bi_opf & REQ_NOWAIT) {
+ if (err == BLK_STS_AGAIN)
+ dio->io_error = -EAGAIN;
+ else if (err == BLK_STS_NOTSUPP)
+ dio->io_error = -EOPNOTSUPP;
+ }
}
if (dio->is_async && dio->op == REQ_OP_READ && dio->should_dirty) {
Looks good. I wonder why it only shows up so rarely. Is there an
alternative path that generates EOPNOTSUPP, that works most of the time?
