summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-05-29 15:52:29 +0200
committerJens Axboe <axboe@kernel.dk>2018-05-29 08:59:21 -0600
commit6600593cbd9340b3d4fcde8e58d17653732620c4 (patch)
tree988e41b87c617a6f8b9d0408f8bc16127e7a8bbf /block
parent12f5b93145450c750f315657ef239a314811aeeb (diff)
downloadlinux-6600593cbd9340b3d4fcde8e58d17653732620c4.tar.gz
linux-6600593cbd9340b3d4fcde8e58d17653732620c4.tar.bz2
linux-6600593cbd9340b3d4fcde8e58d17653732620c4.zip
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.c2
-rw-r--r--block/blk-timeout.c2
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)
case BLK_EH_RESET_TIMER:
blk_add_timer(req);
break;
- case BLK_EH_NOT_HANDLED:
+ case BLK_EH_DONE:
break;
default:
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)
blk_add_timer(req);
blk_clear_rq_complete(req);
break;
- case BLK_EH_NOT_HANDLED:
+ case BLK_EH_DONE:
/*
* LLD handles this for now but in the future
* we can send a request msg to abort the command