diff --git a/[refs] b/[refs] index 5cd3629589c2..3e6959ecb82a 100644 --- 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 index af45e286d5dd..ce919b49b30d 100644 --- 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,