Messages in this thread Patch in this message | | | From | Baolin Wang <> | Subject | [PATCH] block: Remove a duplicative condition | Date | Wed, 2 Sep 2020 09:45:25 +0800 |
| |
Remove a duplicative condition to remove below cppcheck warnings:
"warning: Redundant condition: sched_allow_merge. '!A || (A && B)' is equivalent to '!A || B' [redundantCondition]"
Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com> --- block/blk-merge.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c index 80c9744..6ed7158 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -996,13 +996,11 @@ static enum bio_merge_status blk_attempt_bio_merge(struct request_queue *q, switch (blk_try_merge(rq, bio)) { case ELEVATOR_BACK_MERGE: - if (!sched_allow_merge || - (sched_allow_merge && blk_mq_sched_allow_merge(q, rq, bio))) + if (!sched_allow_merge || blk_mq_sched_allow_merge(q, rq, bio)) return bio_attempt_back_merge(rq, bio, nr_segs); break; case ELEVATOR_FRONT_MERGE: - if (!sched_allow_merge || - (sched_allow_merge && blk_mq_sched_allow_merge(q, rq, bio))) + if (!sched_allow_merge || blk_mq_sched_allow_merge(q, rq, bio)) return bio_attempt_front_merge(rq, bio, nr_segs); break; case ELEVATOR_DISCARD_MERGE: -- 1.8.3.1
| |