diff options
author | Christoph Hellwig <hch@lst.de> | 2018-05-29 09:52:29 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 10:59:21 -0400 |
commit | 6600593cbd9340b3d4fcde8e58d17653732620c4 (patch) | |
tree | 988e41b87c617a6f8b9d0408f8bc16127e7a8bbf /block | |
parent | 12f5b93145450c750f315657ef239a314811aeeb (diff) |
block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE
The BLK_EH_NOT_HANDLED implies nothing happen, but very often that
is not what is happening - instead the driver already completed the
command. Fix the symbolic name to reflect that a little better.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-mq.c | 2 | ||||
-rw-r--r-- | block/blk-timeout.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 6a7803abbf19..42002c2930b0 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -784,7 +784,7 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved) | |||
784 | case BLK_EH_RESET_TIMER: | 784 | case BLK_EH_RESET_TIMER: |
785 | blk_add_timer(req); | 785 | blk_add_timer(req); |
786 | break; | 786 | break; |
787 | case BLK_EH_NOT_HANDLED: | 787 | case BLK_EH_DONE: |
788 | break; | 788 | break; |
789 | default: | 789 | default: |
790 | printk(KERN_ERR "block: bad eh return: %d\n", ret); | 790 | printk(KERN_ERR "block: bad eh return: %d\n", ret); |
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index f95d6e6cbc96..11879e98c249 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c | |||
@@ -93,7 +93,7 @@ static void blk_rq_timed_out(struct request *req) | |||
93 | blk_add_timer(req); | 93 | blk_add_timer(req); |
94 | blk_clear_rq_complete(req); | 94 | blk_clear_rq_complete(req); |
95 | break; | 95 | break; |
96 | case BLK_EH_NOT_HANDLED: | 96 | case BLK_EH_DONE: |
97 | /* | 97 | /* |
98 | * LLD handles this for now but in the future | 98 | * LLD handles this for now but in the future |
99 | * we can send a request msg to abort the command | 99 | * we can send a request msg to abort the command |