[PATCH] nvme-core: fix nvme_setup_cmd trace call

[PATCH] nvme-core: fix nvme_setup_cmd trace call

[Chaitanya Kulkarni]

This patch fixes the trace_nvme_setup_admin_cmd() call, now we use NULL
in place of ns->disk->disk_name when ns variable is NULL.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
---
 drivers/nvme/host/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3250f8d72456..6ac682b67e15 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -655,7 +655,7 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req,
 	if (ns)
 		trace_nvme_setup_nvm_cmd(ns->disk->disk_name, req->q->id, cmd);
 	else
-		trace_nvme_setup_admin_cmd(ns->disk->disk_name, cmd);
+		trace_nvme_setup_admin_cmd(NULL, cmd);
 	return ret;
 }
 EXPORT_SYMBOL_GPL(nvme_setup_cmd);
-- 
2.17.0

[PATCH] nvme-core: fix nvme_setup_cmd trace call

[Johannes Thumshirn]

On Thu, Jun 07, 2018@02:35:01AM -0400, Chaitanya Kulkarni wrote:
> This patch fixes the trace_nvme_setup_admin_cmd() call, now we use NULL
> in place of ns->disk->disk_name when ns variable is NULL.

Oops, good catch,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
-- 
Johannes Thumshirn                                          Storage
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

[PATCH] nvme-core: fix nvme_setup_cmd trace call

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi at rimberg.me>

[PATCH] nvme-core: fix nvme_setup_cmd trace call

[Christoph Hellwig]

On Thu, Jun 07, 2018@09:21:12AM +0200, Johannes Thumshirn wrote:
> On Thu, Jun 07, 2018@02:35:01AM -0400, Chaitanya Kulkarni wrote:
> > This patch fixes the trace_nvme_setup_admin_cmd() call, now we use NULL
> > in place of ns->disk->disk_name when ns variable is NULL.
> 
> Oops, good catch,
> Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

There is no point in ever in the NULL argument to the admin cmd
tracer.  I've dropped the original patch from nvme-4.18, let's redo it
properly for 4.19.

[PATCH] nvme-core: fix nvme_setup_cmd trace call

[Johannes Thumshirn]

On Thu, Jun 07, 2018@04:08:36AM -0700, Christoph Hellwig wrote:
> On Thu, Jun 07, 2018@09:21:12AM +0200, Johannes Thumshirn wrote:
> > On Thu, Jun 07, 2018@02:35:01AM -0400, Chaitanya Kulkarni wrote:
> > > This patch fixes the trace_nvme_setup_admin_cmd() call, now we use NULL
> > > in place of ns->disk->disk_name when ns variable is NULL.
> > 
> > Oops, good catch,
> > Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
> 
> There is no point in ever in the NULL argument to the admin cmd
> tracer.  I've dropped the original patch from nvme-4.18, let's redo it
> properly for 4.19.

Thinking more of it, it's probably best to supply the print the
controller name only. The nvm command tracer would print the NSID
anyways.

Printing the controller name can be done for admin and NVM commands
and should be enough if we really want to distinguish between commands
for different devices.

-- 
Johannes Thumshirn                                          Storage
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850