summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-02-22 14:15:34 -0500
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 15:52:59 -0400
commitc42705592be2a539f3027b6f3907de8e8f9591a8 (patch)
tree43e160cebd92ce2812a8c40f63fbb051e1f769e9 /drivers/block
parent7547881d0951384f9833ec3a80fac8f3f16f3b98 (diff)
downloadop-kernel-dev-c42705592be2a539f3027b6f3907de8e8f9591a8.zip
op-kernel-dev-c42705592be2a539f3027b6f3907de8e8f9591a8.tar.gz
NVMe: Mark CMD_CTX_CANCELLED as being unlikely
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index af45e28..ce919b4 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -518,7 +518,7 @@ static void sync_completion(struct nvme_queue *nvmeq, void *ctx,
struct nvme_completion *cqe)
{
struct sync_cmd_info *cmdinfo = ctx;
- if ((unsigned long)cmdinfo == CMD_CTX_CANCELLED)
+ if (unlikely((unsigned long)cmdinfo == CMD_CTX_CANCELLED))
return;
if (unlikely((unsigned long)cmdinfo == CMD_CTX_COMPLETED)) {
dev_warn(nvmeq->q_dmadev,
OpenPOWER on IntegriCloud