From 8c49c5da9b943fa75c31e3f310c5986e23c350d6 Mon Sep 17 00:00:00 2001 From: Md Shofiqul Islam Date: Thu, 7 May 2026 15:10:56 +0300 Subject: [PATCH] block: blk-merge: Replace == false comparisons with ! The kernel coding style prefers the negation operator '!' over explicit comparison against 'false'. Replace four such comparisons in ll_new_hw_segment(), ll_merge_requests_fn(), and blk_rq_merge_ok(). Also fix a typo in a comment: "occured" -> "occurred". Signed-off-by: Md Shofiqul Islam --- block/blk-merge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index fcf09325b22e3..427b77219a8cc 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -403,7 +403,7 @@ int bio_split_io_at(struct bio *bio, const struct queue_limits *lim, * there may either be too many discontiguous vectors for the max * segments limit, or contain virtual boundary gaps without having a * valid block sized split. A zero byte result means one of those - * conditions occured. + * conditions occurred. */ bytes = ALIGN_DOWN(bytes, bio_split_alignment(bio, lim)); if (!bytes) @@ -547,7 +547,7 @@ static inline int ll_new_hw_segment(struct request *req, struct bio *bio, if (!blk_cgroup_mergeable(req, bio)) goto no_merge; - if (blk_integrity_merge_bio(req->q, req, bio) == false) + if (!blk_integrity_merge_bio(req->q, req, bio)) goto no_merge; /* discard request merge won't add new segment */ @@ -649,7 +649,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, if (!blk_cgroup_mergeable(req, next->bio)) return 0; - if (blk_integrity_merge_rq(q, req, next) == false) + if (!blk_integrity_merge_rq(q, req, next)) return 0; if (!bio_crypt_ctx_merge_rq(req, next)) @@ -905,7 +905,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) if (!blk_cgroup_mergeable(rq, bio)) return false; - if (blk_integrity_merge_bio(rq->q, rq, bio) == false) + if (!blk_integrity_merge_bio(rq->q, rq, bio)) return false; if (!bio_crypt_rq_ctx_compatible(rq, bio)) return false; @@ -915,7 +915,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) return false; if (rq->bio->bi_ioprio != bio->bi_ioprio) return false; - if (blk_atomic_write_mergeable_rq_bio(rq, bio) == false) + if (!blk_atomic_write_mergeable_rq_bio(rq, bio)) return false; return true;