[Devel] [PATCH RHEL9 COMMIT] dm-ploop: use proper MAX value for clu

Konstantin Khorenko khorenko at virtuozzo.com
Wed Jun 25 13:51:18 MSK 2025


The commit is pushed to "branch-rh9-5.14.0-427.55.1.vz9.82.x-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh9-5.14.0-427.55.1.el9
------>
commit 9d2359f43a21718dd3a17231f4d17940c2a87bff
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Tue Jun 17 16:39:53 2025 +0300

    dm-ploop: use proper MAX value for clu
    
    Almost everywhere clu is u32, so use U32_MAX instead of UINT_MAX.
    
    The only exception is struct ploop_cmd::resize.clu
    which is "unsigned int".
    
    No logic change, just a cleanup.
    
    Fixes: 3e756367e184 ("dm-ploop: Add ploop target driver")
    Found while working on https://virtuozzo.atlassian.net/browse/VSTOR-107975
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    Reviewed-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    
    Feature: dm-ploop: ploop target driver
---
 drivers/md/dm-ploop-cmd.c | 8 ++++----
 drivers/md/dm-ploop-map.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c
index 7d79b900eb1aa..691eefd0b9f65 100644
--- a/drivers/md/dm-ploop-cmd.c
+++ b/drivers/md/dm-ploop-cmd.c
@@ -179,12 +179,12 @@ static u32 ploop_find_bat_entry(struct ploop *ploop, u32 dst_clu, bool *is_locke
 			}
 		}
 		spin_unlock_irqrestore(&md->md_lock, flags);
-		if (clu != UINT_MAX)
+		if (clu != U32_MAX)
 			break;
 	}
 
 	*is_locked = false;
-	if (clu != UINT_MAX) {
+	if (clu != U32_MAX) {
 		spin_lock_irq(&ploop->deferred_lock);
 		*is_locked = ploop_find_lk_of_cluster(ploop, clu);
 		spin_unlock_irq(&ploop->deferred_lock);
@@ -295,7 +295,7 @@ static int ploop_grow_relocate_cluster(struct ploop *ploop,
 
 	/* Relocate clu and update index */
 	clu = ploop_find_bat_entry(ploop, dst_clu, &is_locked);
-	if (clu == UINT_MAX || is_locked) {
+	if (clu == U32_MAX || is_locked) {
 		/* dst_clu in top delta is not occupied? */
 		if (!test_bit(dst_clu, ploop->holes_bitmap) || is_locked) {
 			WARN_ON_ONCE(1);
@@ -585,7 +585,7 @@ static int ploop_resize(struct ploop *ploop, sector_t new_sectors)
 	if (old_sectors > new_sectors) {
 		DMWARN("online shrink is not supported");
 		return -EINVAL;
-	} else if (SEC_TO_CLU(ploop, new_sectors) >= UINT_MAX - 2) {
+	} else if (SEC_TO_CLU(ploop, new_sectors) >= U32_MAX - 2) {
 		DMWARN("resize: too large size is requested");
 		return -EINVAL;
 	} else if (new_sectors & (CLU_TO_SEC(ploop, 1) - 1)) {
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index 35085a04ca5f5..6fff0aeb9e839 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -95,7 +95,7 @@ void ploop_init_pio(struct ploop *ploop, unsigned int bi_op, struct pio *pio)
 	INIT_HLIST_NODE(&pio->hlist_node);
 	INIT_LIST_HEAD(&pio->endio_list);
 	/* FIXME: assign real clu? */
-	pio->clu = UINT_MAX;
+	pio->clu = U32_MAX;
 	pio->level = BAT_LEVEL_INVALID;
 	pio->retries = 0;
 }


More information about the Devel mailing list