]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
repart: ensure partition_max_size() >= partition_min_size()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 4 Sep 2022 09:25:03 +0000 (18:25 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 8 Sep 2022 20:35:40 +0000 (05:35 +0900)
src/partition/repart.c

index ddbac9a596b5926fd0869115050172885328571a..1b61700dd0c867ac6faec832bb316d5de56e9259 100644 (file)
@@ -522,9 +522,9 @@ static uint64_t partition_max_size(const Context *context, const Partition *p) {
         sm = round_down_size(p->size_max, context->grain_size);
 
         if (p->current_size != UINT64_MAX)
-                return MAX(p->current_size, sm);
+                sm = MAX(p->current_size, sm);
 
-        return sm;
+        return MAX(partition_min_size(context, p), sm);
 }
 
 static uint64_t partition_min_size_with_padding(Context *context, const Partition *p) {