From 84b1e80f67f74a9d505802343458d4ebe8bdb3e4 Mon Sep 17 00:00:00 2001
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Date: Thu, 3 Mar 2022 20:43:40 +0100
Subject: [PATCH] block/reqlist: reqlist_find_conflict(): use ranges_overlap()
Let's reuse convenient helper.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220303194349.2304213-8-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/reqlist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/reqlist.c b/block/reqlist.c
index 5e320ba649f..09fecbd48c4 100644
--- a/block/reqlist.c
+++ b/block/reqlist.c
@@ -13,6 +13,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/range.h"
#include "block/reqlist.h"
@@ -35,7 +36,7 @@ BlockReq *reqlist_find_conflict(BlockReqList *reqs, int64_t offset,
BlockReq *r;
QLIST_FOREACH(r, reqs, list) {
- if (offset + bytes > r->offset && offset < r->offset + r->bytes) {
+ if (ranges_overlap(offset, bytes, r->offset, r->bytes)) {
return r;
}
}
--
GitLab