diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-07-02 13:37:43 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-05 12:44:56 -0500 |
commit | aa24cc361e514e47b59dbc79aba11bf48495ecb9 (patch) | |
tree | a6bde3fdd3b6b649be7dc2e78b0e13b49eae11cf | |
parent | 60d726a2d9ad5980a97220e171cf7ed9a2b610a4 (diff) |
block: Add blk_status_to_str()
If we're going to the trouble of having these nice error strings, let's
make them available.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r-- | block/blk-core.c | 13 | ||||
-rw-r--r-- | include/linux/blkdev.h | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 10c08ac50697..d68f24a7ee48 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -213,18 +213,23 @@ int blk_status_to_errno(blk_status_t status) } EXPORT_SYMBOL_GPL(blk_status_to_errno); -static void print_req_error(struct request *req, blk_status_t status, - const char *caller) +const char *blk_status_to_str(blk_status_t status) { int idx = (__force int)status; if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors))) - return; + return "(invalid error)"; + return blk_errors[idx].name; +} +EXPORT_SYMBOL_GPL(blk_status_to_str); +static void print_req_error(struct request *req, blk_status_t status, + const char *caller) +{ printk_ratelimited(KERN_ERR "%s: %s error, dev %s, sector %llu op 0x%x:(%s) flags 0x%x " "phys_seg %u prio class %u\n", - caller, blk_errors[idx].name, + caller, blk_status_to_str(status), req->rq_disk ? req->rq_disk->disk_name : "?", blk_rq_pos(req), req_op(req), blk_op_str(req_op(req)), req->cmd_flags & ~REQ_OP_MASK, diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 868e11face00..d9e3b7b0175e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -936,6 +936,7 @@ extern const char *blk_op_str(unsigned int op); int blk_status_to_errno(blk_status_t status); blk_status_t errno_to_blk_status(int errno); +const char *blk_status_to_str(blk_status_t status); int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin); |