* [PATCH] block: Remove a duplicative condition
@ 2020-09-02 1:45 Baolin Wang
2020-09-02 1:48 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Baolin Wang @ 2020-09-02 1:45 UTC (permalink / raw)
To: axboe
Cc: ming.lei, hch, baolin.wang, baolin.wang7, dan.carpenter,
linux-block, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] block: Remove a duplicative condition
2020-09-02 1:45 [PATCH] block: Remove a duplicative condition Baolin Wang
@ 2020-09-02 1:48 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2020-09-02 1:48 UTC (permalink / raw)
To: Baolin Wang
Cc: ming.lei, hch, baolin.wang7, dan.carpenter, linux-block, linux-kernel
On 9/1/20 7:45 PM, Baolin Wang wrote:
> Remove a duplicative condition to remove below cppcheck warnings:
Thanks, applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-02 1:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 1:45 [PATCH] block: Remove a duplicative condition Baolin Wang
2020-09-02 1:48 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).