From: Matthew Wilcox Date: Tue, 22 Feb 2011 19:15:34 +0000 (-0500) Subject: NVMe: Mark CMD_CTX_CANCELLED as being unlikely X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c42705592be2a539f3027b6f3907de8e8f9591a8;p=deliverable%2Flinux.git NVMe: Mark CMD_CTX_CANCELLED as being unlikely Signed-off-by: Matthew Wilcox --- diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c index af45e286d5dd..ce919b49b30d 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,