1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-15 22:05:02 -05:00

Add a cushion for diskspace checking

It is the minimum of 5% of disk capacity or 20 MiB on a per-partition basis.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-12-15 00:14:25 -06:00
parent 6605637b53
commit ab9c0814d2

View File

@ -294,10 +294,15 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
for(i = mount_points; i; i = alpm_list_next(i)) { for(i = mount_points; i; i = alpm_list_next(i)) {
alpm_mountpoint_t *data = i->data; alpm_mountpoint_t *data = i->data;
if(data->used == 1) { if(data->used == 1) {
_alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, free %ld\n", /* cushion is roughly min(5% capacity, 20MiB) */
data->mount_dir, data->max_blocks_needed, long fivepc = (data->fsp.f_blocks / 20) + 1;
long twentymb = (20 * 1024 * 1024 / data->fsp.f_bsize) + 1;
long cushion = fivepc < twentymb ? fivepc : twentymb;
_alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, cushion %ld, free %ld\n",
data->mount_dir, data->max_blocks_needed, cushion,
(unsigned long)data->fsp.f_bfree); (unsigned long)data->fsp.f_bfree);
if(data->max_blocks_needed > data->fsp.f_bfree) { if(data->max_blocks_needed + cushion > data->fsp.f_bfree) {
abort = 1; abort = 1;
} }
} }