block: improve print_req_error

Print the calling function instead of print_req_error as a prefix, and
print the operation and op_flags separately instead of the whole field.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index e1b77113671e8ad32430cf562c5c04ff348e2104..c97da29ddc07ad0bf1732272dc35c08adc0925a0 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -167,18 +167,20 @@ 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)
+static void print_req_error(struct request *req, blk_status_t status,
+               const char *caller)
 {
        int idx = (__force int)status;
 
        if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
                return;
 
-       printk_ratelimited(KERN_ERR "%s: %s error, dev %s, sector %llu flags %x\n",
-                               __func__, blk_errors[idx].name,
-                               req->rq_disk ?  req->rq_disk->disk_name : "?",
-                               (unsigned long long)blk_rq_pos(req),
-                               req->cmd_flags);
+       printk_ratelimited(KERN_ERR
+               "%s: %s error, dev %s, sector %llu op 0x%x flags 0x%x\n",
+               caller, blk_errors[idx].name,
+               req->rq_disk ?  req->rq_disk->disk_name : "?",
+               blk_rq_pos(req), req_op(req),
+               req->cmd_flags & ~REQ_OP_MASK);
 }
 
 static void req_bio_endio(struct request *rq, struct bio *bio,
@@ -1362,7 +1364,7 @@ bool blk_update_request(struct request *req, blk_status_t error,
 
        if (unlikely(error && !blk_rq_is_passthrough(req) &&
                     !(req->rq_flags & RQF_QUIET)))
-               print_req_error(req, error);
+               print_req_error(req, error, __func__);
 
        blk_account_io_completion(req, nr_bytes);