commit c42705592be2a539f3027b6f3907de8e8f9591a8
author Matthew Wilcox <matthew.r.wilcox@intel.com> Tue Feb 22 14:15:34 2011 -0500
committer Matthew Wilcox <matthew.r.wilcox@intel.com> Fri Nov 04 15:52:59 2011 -0400
tree 43e160cebd92ce2812a8c40f63fbb051e1f769e9
parent 7547881d0951384f9833ec3a80fac8f3f16f3b98

NVMe: Mark CMD_CTX_CANCELLED as being unlikely

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

drivers/block/nvme.c

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 @@
 						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,