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

lib/repo: Do free space math under lock in error path 

We were referencing the txn bits outside of the lock in the error
path. Generally shouldn't matter, but e.g. Rust wouldn't let us do this, and
race detector tooling will warn about it.

Closes: #1632
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-06-18 14:47:49 +00:00 committed by Atomic Bot
parent acab2c1ac6
commit 5e9d382811
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -896,8 +896,9 @@ write_content_object (OstreeRepo *self,
const fsblkcnt_t object_blocks = (size / self->txn.blocksize) + 1; const fsblkcnt_t object_blocks = (size / self->txn.blocksize) + 1;
if (object_blocks > self->txn.max_blocks) if (object_blocks > self->txn.max_blocks)
{ {
guint64 bytes_required = (guint64)object_blocks * self->txn.blocksize;
g_mutex_unlock (&self->txn_lock); g_mutex_unlock (&self->txn_lock);
g_autofree char *formatted_required = g_format_size ((guint64)object_blocks * self->txn.blocksize); g_autofree char *formatted_required = g_format_size (bytes_required);
if (self->min_free_space_percent > 0) if (self->min_free_space_percent > 0)
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required", return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required",
self->min_free_space_percent, formatted_required); self->min_free_space_percent, formatted_required);
@ -1609,8 +1610,9 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
self->txn.max_blocks = bfree - reserved_blocks; self->txn.max_blocks = bfree - reserved_blocks;
else else
{ {
guint64 bytes_required = bfree * self->txn.blocksize;
g_mutex_unlock (&self->txn_lock); g_mutex_unlock (&self->txn_lock);
g_autofree char *formatted_free = g_format_size (bfree * self->txn.blocksize); g_autofree char *formatted_free = g_format_size (bytes_required);
if (self->min_free_space_percent > 0) if (self->min_free_space_percent > 0)
return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available", return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available",
self->min_free_space_percent, formatted_free); self->min_free_space_percent, formatted_free);