---

yaml --- r: 286271 b: refs/heads/master c: c427055 h: refs/heads/master i: 286269: eb5b80a 286267: 38e76da 286263: f08c48c 286255: 15c7efc 286239: 7ba2c60 286207: 9e886a4 v: v3
git-mirror · Nov 4, 2011 · aacdc5d · aacdc5d
1 parent e7608cc
commit aacdc5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7547881d0951384f9833ec3a80fac8f3f16f3b98
+refs/heads/master: c42705592be2a539f3027b6f3907de8e8f9591a8
diff --git a/trunk/drivers/block/nvme.c b/trunk/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,