diff options
| author | Igor Stoppa <igor.stoppa@gmail.com> | 2018-09-07 20:03:37 +0300 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2018-10-16 14:34:59 -0400 |
| commit | bab5d988841e58fec6ae22f486905ddde2d715f4 (patch) | |
| tree | 56ed29d634d8023a3cccb85c7814d6998dec7790 | |
| parent | 092b5648760a23656f6dcc83b74f4cf661094aca (diff) | |
| download | linux-bab5d988841e58fec6ae22f486905ddde2d715f4.tar.bz2 | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm.c | 2 |
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) struct policy_work work; struct entry *e; - if (unlikely(WARN_ON_ONCE(!mq->migrations_allowed))) + if (WARN_ON_ONCE(!mq->migrations_allowed)) return; 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, * Defend against IO still getting in during teardown * - as was seen for a time with nvme-fcloop */ - if (unlikely(WARN_ON_ONCE(!ti || !dm_target_is_valid(ti)))) { + if (WARN_ON_ONCE(!ti || !dm_target_is_valid(ti))) { error = -EIO; goto out; } |