packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/repo: Rename free_space_size variable to free_space_mb 

I generally like having variables include their units where applicable;
timer variables having `_secs` or `_ms`, etc.

Closes: #1632
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-06-18 14:40:24 +00:00 committed by Atomic Bot
parent a2b08f9342
commit acab2c1ac6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libostree/ostree-repo-commit.c
View File

@ -889,7 +889,7 @@ write_content_object (OstreeRepo *self,
size = 0; size = 0;
/* Free space check; only applies during transactions */ /* Free space check; only applies during transactions */
if ((self->min_free_space_percent > 0 || self->min_free_space_size > 0) && self->in_transaction) if ((self->min_free_space_percent > 0 || self->min_free_space_mb > 0) && self->in_transaction)
{ {
g_mutex_lock (&self->txn_lock); g_mutex_lock (&self->txn_lock);
g_assert_cmpint (self->txn.blocksize, >, 0); g_assert_cmpint (self->txn.blocksize, >, 0);
@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self,
self->min_free_space_percent, formatted_required); self->min_free_space_percent, formatted_required);
else else
return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required", return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required",
self->min_free_space_size, formatted_required); self->min_free_space_mb, formatted_required);
} }
/* This is the main bit that needs mutex protection */ /* This is the main bit that needs mutex protection */
self->txn.max_blocks -= object_blocks; self->txn.max_blocks -= object_blocks;
@ -1500,9 +1500,9 @@ min_free_space_calculate_reserved_blocks (OstreeRepo *self, struct statvfs *stvf
{ {
guint64 reserved_blocks = 0; guint64 reserved_blocks = 0;
if (self->min_free_space_size > 0) if (self->min_free_space_mb > 0)
{ {
reserved_blocks = (self->min_free_space_size << 20) / stvfsbuf->f_bsize; reserved_blocks = (self->min_free_space_mb << 20) / stvfsbuf->f_bsize;
} }
else if (self->min_free_space_percent > 0) else if (self->min_free_space_percent > 0)
{ {
@ -1595,7 +1595,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
return FALSE; return FALSE;
self->in_transaction = TRUE; self->in_transaction = TRUE;
if (self->min_free_space_percent >= 0 || self->min_free_space_size >= 0) if (self->min_free_space_percent >= 0 || self->min_free_space_mb >= 0)
{ {
struct statvfs stvfsbuf; struct statvfs stvfsbuf;
if (TEMP_FAILURE_RETRY (fstatvfs (self->repo_dir_fd, &stvfsbuf)) < 0) if (TEMP_FAILURE_RETRY (fstatvfs (self->repo_dir_fd, &stvfsbuf)) < 0)
@ -1616,7 +1616,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
self->min_free_space_percent, formatted_free); self->min_free_space_percent, formatted_free);
else else
return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available", return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available",
self->min_free_space_size, formatted_free); self->min_free_space_mb, formatted_free);
} }
g_mutex_unlock (&self->txn_lock); g_mutex_unlock (&self->txn_lock);
} }

2
src/libostree/ostree-repo-private.h
View File

@ -151,7 +151,7 @@ struct OstreeRepo {
uid_t target_owner_uid; /* Ensure files are chowned to this uid/gid */ uid_t target_owner_uid; /* Ensure files are chowned to this uid/gid */
gid_t target_owner_gid; gid_t target_owner_gid;
guint min_free_space_percent; /* See the min-free-space-percent config option */ guint min_free_space_percent; /* See the min-free-space-percent config option */
guint64 min_free_space_size; /* See the min-free-space-size config option */ guint64 min_free_space_mb; /* See the min-free-space-size config option */
guint test_error_flags; /* OstreeRepoTestErrorFlags */ guint test_error_flags; /* OstreeRepoTestErrorFlags */

2
src/libostree/ostree-repo.c
View File

@ -2691,7 +2691,7 @@ min_free_space_size_validate_and_convert (OstreeRepo *self,
g_assert_not_reached (); g_assert_not_reached ();
} }
self->min_free_space_size = g_ascii_strtoull (size_str, NULL, 10) << shifts; self->min_free_space_mb = g_ascii_strtoull (size_str, NULL, 10) << shifts;
return TRUE; return TRUE;
} }