shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 06:25:37 +03:00
Code

repart: make partition_max_size() return UINT64_MAX if not specified

Browse Source 
Previously, it did not return UINT64_MAX, but a huge value, as
`UINT64_MAX / grain_size * grain_size != UINT64_MAX`.

This also drops unnecessary conditions.
This commit is contained in:
Yu Watanabe 2022-09-04 15:19:18 +09:00
parent a80701e68f
commit 822d9b9adc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/partition/repart.c
View File

@ -516,6 +516,9 @@ static uint64_t partition_max_size(const Context *context, const Partition *p) {
return p->current_size; return p->current_size;
} }
if (p->size_max == UINT64_MAX)
return UINT64_MAX;
sm = round_down_size(p->size_max, context->grain_size); sm = round_down_size(p->size_max, context->grain_size);
if (p->current_size != UINT64_MAX) if (p->current_size != UINT64_MAX)
@ -759,7 +762,7 @@ static int context_grow_partitions_phase(
p->new_size = rsz; p->new_size = rsz;
charge = try_again = true; charge = try_again = true;
} else if (phase == PHASE_UNDERCHARGE && xsz != UINT64_MAX && xsz < share) { } else if (phase == PHASE_UNDERCHARGE && xsz < share) {
/* This partition accepts less than its calculated /* This partition accepts less than its calculated
* share. Let's assign it that, and take this partition out * share. Let's assign it that, and take this partition out
* of all calculations and start again. */ * of all calculations and start again. */
@ -867,7 +870,7 @@ static int context_grow_partitions_on_free_area(Context *context, FreeArea *a) {
m = MAX(a->after->new_size, round_down_size(a->after->new_size + span, context->grain_size)); m = MAX(a->after->new_size, round_down_size(a->after->new_size + span, context->grain_size));
xsz = partition_max_size(context, a->after); xsz = partition_max_size(context, a->after);
if (xsz != UINT64_MAX && m > xsz) if (m > xsz)
m = xsz; m = xsz;
span = charge_size(context, span, m - a->after->new_size); span = charge_size(context, span, m - a->after->new_size);
@ -890,7 +893,7 @@ static int context_grow_partitions_on_free_area(Context *context, FreeArea *a) {
m = MAX(p->new_size, round_down_size(p->new_size + span, context->grain_size)); m = MAX(p->new_size, round_down_size(p->new_size + span, context->grain_size));
xsz = partition_max_size(context, p); xsz = partition_max_size(context, p);
if (xsz != UINT64_MAX && m > xsz) if (m > xsz)
m = xsz; m = xsz;
span = charge_size(context, span, m - p->new_size); span = charge_size(context, span, m - p->new_size);