nvmet: use a macro for default error location
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tue, 18 Dec 2018 02:35:29 +0000 (18:35 -0800)
committerChristoph Hellwig <hch@lst.de>
Tue, 18 Dec 2018 16:50:44 +0000 (17:50 +0100)
This patch defines a new macro NVMET_NO_ERROR_LOC to represent the
default error location value in the nvme-error-log-page.
This is a pure cleanup patch and it does not change any functionality.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/core.c
drivers/nvme/target/nvmet.h

index b9c219c931ebbba4afe08a32fbc69311d4ae1830..88d260f31835b9239149d7888b790e2fde1563f4 100644 (file)
@@ -663,7 +663,7 @@ static void nvmet_set_error(struct nvmet_req *req, u16 status)
 
        req->rsp->status = cpu_to_le16(status << 1);
 
-       if (!ctrl || req->error_loc == (u16)-1)
+       if (!ctrl || req->error_loc == NVMET_NO_ERROR_LOC)
                return;
 
        spin_lock_irqsave(&ctrl->error_lock, flags);
@@ -849,7 +849,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,
        req->rsp->status = 0;
        req->rsp->sq_head = 0;
        req->ns = NULL;
-       req->error_loc = -1;
+       req->error_loc = NVMET_NO_ERROR_LOC;
        req->error_slba = 0;
 
        /* no support for fused commands yet */
index 3b5f0bcaf3e83d4a0eec2139116b04ba42405437..3e4719fdba8547f25126fecc4bea39ed0d0b1bf5 100644 (file)
@@ -30,6 +30,7 @@
 
 #define NVMET_ASYNC_EVENTS             4
 #define NVMET_ERROR_LOG_SLOTS          128
+#define NVMET_NO_ERROR_LOC             ((u16)-1)
 
 /*
  * Supported optional AENs: