block: Remove a duplicative condition
authorBaolin Wang <baolin.wang@linux.alibaba.com>
Wed, 2 Sep 2020 01:45:25 +0000 (09:45 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 2 Sep 2020 01:48:06 +0000 (19:48 -0600)
commit265600b7b6e88f3cc4cef2774afe0eb4abe72d72
tree75654937e6130a4deb47548e054634abee64dc9e
parent8327cce5ff9376fac9ff713a8d5c99c16ba3fa33
block: Remove a duplicative condition

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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-merge.c