From: Johannes Thumshirn Date: Thu, 26 Apr 2018 20:25:15 +0000 (-0600) Subject: nvme: change order of qid and cmdid in completion trace X-Git-Tag: v4.19~950^2~88^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cde6bf4f440631b2735be83c39426f4f469b0b21;p=platform%2Fkernel%2Flinux-rpi3.git nvme: change order of qid and cmdid in completion trace Keith reported that command submission and command completion tracepoints have the order of the cmdid and qid fields swapped. While it isn't easily possible to change the command submission tracepoint, as there is a regression test parsing it in blktests we can swap the command completion tracepoint to have the fields aligned. Signed-off-by: Johannes Thumshirn Reported-by: Keith Busch Reviewed-by: Jens Axboe Signed-off-by: Keith Busch --- diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h index ea91fcc..01390f0 100644 --- a/drivers/nvme/host/trace.h +++ b/drivers/nvme/host/trace.h @@ -148,8 +148,8 @@ TRACE_EVENT(nvme_complete_rq, __entry->flags = nvme_req(req)->flags; __entry->status = nvme_req(req)->status; ), - TP_printk("cmdid=%u, qid=%d, res=%llu, retries=%u, flags=0x%x, status=%u", - __entry->cid, __entry->qid, __entry->result, + TP_printk("qid=%d, cmdid=%u, res=%llu, retries=%u, flags=0x%x, status=%u", + __entry->qid, __entry->cid, __entry->result, __entry->retries, __entry->flags, __entry->status) );