diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:20:43 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:20:51 -0300 |
| commit | 98415300084cf02728bd5b8bd283b74f3f0d9213 (patch) | |
| tree | 62f734b65ac2d7a9b4fbf045c69db1c961b8ab4d /block | |
| parent | b115353e00d8f22bb04b0a84b641d0fb18df738f (diff) | |
| parent | 3e98e33d345e981800e03dd29f6f6343286d30b6 (diff) | |
Merge tag 'v5.15.70' into 5.15-2.1.x-imx
This is the 5.15.70 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 5009b9f1c3c9..13e1fca1e923 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -447,7 +447,7 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags) while (!blk_try_enter_queue(q, pm)) { if (flags & BLK_MQ_REQ_NOWAIT) - return -EBUSY; + return -EAGAIN; /* * read pair of barrier in blk_freeze_queue_start(), we need to @@ -478,7 +478,7 @@ static inline int bio_queue_enter(struct bio *bio) if (test_bit(GD_DEAD, &disk->state)) goto dead; bio_wouldblock_error(bio); - return -EBUSY; + return -EAGAIN; } /* |