From 7ba0017468d977cf51bfce0e708317ab84bc04e7 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 20 Jul 2017 16:16:51 +0100 Subject: [PATCH] raid: avoid lv_size compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit warning: declaration of ‘lv_size’ shadows a global declaration --- lib/metadata/raid_manip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index e275da11a..b90d6f414 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -1526,7 +1526,7 @@ static int _lv_relocate_reshape_space(struct logical_volume *lv, enum alloc_wher /* HM Helper: reset @lv to @segtype, @stripe_size and @lv_size post lv_extend() when changed for area_count < 3. */ static int _lv_alloc_reshape_post_extend(struct logical_volume *lv, const struct segment_type *segtype, - uint32_t stripe_size, uint64_t lv_size) + uint32_t stripe_size, uint64_t lv_size_cur) { struct lv_segment *seg = first_seg(lv); @@ -1534,7 +1534,7 @@ static int _lv_alloc_reshape_post_extend(struct logical_volume *lv, /* Reset segment type, stripe and lv size */ seg->segtype = segtype; seg->stripe_size = stripe_size; - lv->size = lv_size; + lv->size = lv_size_cur; /* Update and reload mapping for proper size of data SubLVs in the cluster */ if (!lv_update_and_reload(lv)) -- 2.43.5