From aacdc5d77f3f824a2cbb113ebcf42d17ca1bcfd2 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 22 Feb 2011 14:15:34 -0500 Subject: [PATCH] --- yaml --- r: 286271 b: refs/heads/master c: c42705592be2a539f3027b6f3907de8e8f9591a8 h: refs/heads/master i: 286269: eb5b80a49a09bc1d4af4a5ec4c3e6c3e64899aa3 286267: 38e76da4ef78e9f44266de9c6be2d45048245253 286263: f08c48c9b795d95b28f0a090263ee1c8280b752f 286255: 15c7efc4f64fe896103e231b4b9878c310a61cf0 286239: 7ba2c60e4534ec9d281c822f63903cf8cc408c75 286207: 9e886a4ae99180ccd4d9d29c75c164d16c64d3c0 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,