The commit is pushed to "branch-rh9-5.14.0-427.55.1.vz9.82.x-ovz" and will appear at g...@bitbucket.org:openvz/vzkernel.git after rh9-5.14.0-427.55.1.vz9.82.3 ------> commit c78adb2e32ae8398c9fe495388f397ab228f2ecb Author: Pavel Tikhomirov <ptikhomi...@virtuozzo.com> Date: Mon Jul 7 10:36:36 2025 +0200
dm-ploop: drop old_size variable in ploop_allocate_cluster() Redundant variable. https://virtuozzo.atlassian.net/browse/VSTOR-108868 Co-developed-by: Andrey Zhadchenko <andrey.zhadche...@virtuozzo.com> Signed-off-by: Pavel Tikhomirov <ptikhomi...@virtuozzo.com> Feature: dm-ploop: ploop target driver --- drivers/md/dm-ploop-map.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c index 93549cca5980c..2df5f38b9e9b3 100644 --- a/drivers/md/dm-ploop-map.c +++ b/drivers/md/dm-ploop-map.c @@ -1259,7 +1259,7 @@ static int ploop_allocate_cluster(struct ploop *ploop, u32 *dst_clu, struct file { struct ploop_delta *top = ploop_top_delta(ploop); u32 clu_size = CLU_SIZE(ploop); - loff_t off, pos, end, old_size; + loff_t off, pos, end; unsigned long flags; int ret; int retry_cnt = 0; @@ -1278,11 +1278,10 @@ static int ploop_allocate_cluster(struct ploop *ploop, u32 *dst_clu, struct file */ ploop_hole_clear_bit(*dst_clu, ploop); - old_size = top->file_size; prealloc_start = top->file_preallocated_area_start; pos = CLU_TO_POS(ploop, *dst_clu); end = pos + clu_size; - off = min_t(loff_t, old_size, end); + off = min_t(loff_t, top->file_size, end); spin_unlock_irqrestore(&ploop->bat_lock, flags); if (pos < prealloc_start) { @@ -1316,8 +1315,7 @@ static int ploop_allocate_cluster(struct ploop *ploop, u32 *dst_clu, struct file retry_alloc: spin_lock_irqsave(&ploop->bat_lock, flags); /* size can change from parallel alloc */ - old_size = top->file_size; - if (end > old_size) { + if (end > top->file_size) { ploop_req_prealloc(ploop, PREALLOC_SIZE); spin_unlock_irqrestore(&ploop->bat_lock, flags); _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel