aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Stoppa <igor.stoppa@gmail.com>2018-09-07 13:03:37 -0400
committerMike Snitzer <snitzer@redhat.com>2018-10-16 14:34:59 -0400
commitbab5d988841e58fec6ae22f486905ddde2d715f4 (patch)
tree56ed29d634d8023a3cccb85c7814d6998dec7790
parent092b5648760a23656f6dcc83b74f4cf661094aca (diff)
dm: remove unnecessary unlikely() around WARN_ON_ONCE()
WARN_ON() already contains an unlikely(), so it's not necessary to wrap it into another. Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/dm-cache-policy-smq.c2
-rw-r--r--drivers/md/dm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-cache-policy-smq.c b/drivers/md/dm-cache-policy-smq.c
index 1b5b9ad9e492..b61aac00ff40 100644
--- a/drivers/md/dm-cache-policy-smq.c
+++ b/drivers/md/dm-cache-policy-smq.c
@@ -1200,7 +1200,7 @@ static void queue_demotion(struct smq_policy *mq)
1200 struct policy_work work; 1200 struct policy_work work;
1201 struct entry *e; 1201 struct entry *e;
1202 1202
1203 if (unlikely(WARN_ON_ONCE(!mq->migrations_allowed))) 1203 if (WARN_ON_ONCE(!mq->migrations_allowed))
1204 return; 1204 return;
1205 1205
1206 e = q_peek(&mq->clean, mq->clean.nr_levels / 2, true); 1206 e = q_peek(&mq->clean, mq->clean.nr_levels / 2, true);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index bf36e2635ea7..1fbc28ab157c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1666,7 +1666,7 @@ static blk_qc_t __process_bio(struct mapped_device *md,
1666 * Defend against IO still getting in during teardown 1666 * Defend against IO still getting in during teardown
1667 * - as was seen for a time with nvme-fcloop 1667 * - as was seen for a time with nvme-fcloop
1668 */ 1668 */
1669 if (unlikely(WARN_ON_ONCE(!ti || !dm_target_is_valid(ti)))) { 1669 if (WARN_ON_ONCE(!ti || !dm_target_is_valid(ti))) {
1670 error = -EIO; 1670 error = -EIO;
1671 goto out; 1671 goto out;
1672 } 1672 }