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

lib/checkout: Use TEMP_FAILURE_RETRY() 

I'm still not sure it's worth using, but it's easier on the eyes for sure.

Closes: #816
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-04-26 17:38:14 -04:00 committed by Atomic Bot
parent d37acd3007
commit 838cbab585
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/libostree/ostree-repo-checkout.c
View File

@ -68,11 +68,7 @@ checkout_object_for_uncompressed_cache (OstreeRepo *self,
if (!self->disable_fsync) if (!self->disable_fsync)
{ {
int res; if (TEMP_FAILURE_RETRY (fsync (fd)) < 0)
do
res = fsync (fd);
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
} }
@ -126,19 +122,11 @@ write_regular_file_content (OstreeRepo *self,
if (mode != OSTREE_REPO_CHECKOUT_MODE_USER) if (mode != OSTREE_REPO_CHECKOUT_MODE_USER)
{ {
int res; if (TEMP_FAILURE_RETRY (fchown (fd, g_file_info_get_attribute_uint32 (file_info, "unix::uid"),
do g_file_info_get_attribute_uint32 (file_info, "unix::gid"))) < 0)
res = fchown (fd,
g_file_info_get_attribute_uint32 (file_info, "unix::uid"),
g_file_info_get_attribute_uint32 (file_info, "unix::gid"));
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
do if (TEMP_FAILURE_RETRY (fchmod (fd, g_file_info_get_attribute_uint32 (file_info, "unix::mode"))) < 0)
res = fchmod (fd, g_file_info_get_attribute_uint32 (file_info, "unix::mode"));
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
if (xattrs) if (xattrs)
@ -598,7 +586,6 @@ checkout_tree_at_recurse (OstreeRepo *self,
GError **error) GError **error)
{ {
gboolean did_exist = FALSE; gboolean did_exist = FALSE;
int res;
const gboolean sepolicy_enabled = options->sepolicy && !self->disable_xattrs; const gboolean sepolicy_enabled = options->sepolicy && !self->disable_xattrs;
g_autoptr(GVariant) xattrs = NULL; g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GVariant) modified_xattrs = NULL; g_autoptr(GVariant) modified_xattrs = NULL;
@ -733,22 +720,15 @@ checkout_tree_at_recurse (OstreeRepo *self,
*/ */
if (!did_exist) if (!did_exist)
{ {
do if (TEMP_FAILURE_RETRY (fchmod (destination_dfd, g_file_info_get_attribute_uint32 (source_info, "unix::mode"))) < 0)
res = fchmod (destination_dfd,
g_file_info_get_attribute_uint32 (source_info, "unix::mode"));
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
} }
if (!did_exist && options->mode != OSTREE_REPO_CHECKOUT_MODE_USER) if (!did_exist && options->mode != OSTREE_REPO_CHECKOUT_MODE_USER)
{ {
do if (TEMP_FAILURE_RETRY (fchown (destination_dfd,
res = fchown (destination_dfd, g_file_info_get_attribute_uint32 (source_info, "unix::uid"),
g_file_info_get_attribute_uint32 (source_info, "unix::uid"), g_file_info_get_attribute_uint32 (source_info, "unix::gid"))) < 0)
g_file_info_get_attribute_uint32 (source_info, "unix::gid"));
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
} }
@ -758,10 +738,7 @@ checkout_tree_at_recurse (OstreeRepo *self,
if (!did_exist) if (!did_exist)
{ {
const struct timespec times[2] = { { OSTREE_TIMESTAMP, UTIME_OMIT }, { OSTREE_TIMESTAMP, 0} }; const struct timespec times[2] = { { OSTREE_TIMESTAMP, UTIME_OMIT }, { OSTREE_TIMESTAMP, 0} };
do if (TEMP_FAILURE_RETRY (futimens (destination_dfd, times)) < 0)
res = futimens (destination_dfd, times);
while (G_UNLIKELY (res == -1 && errno == EINTR));
if (G_UNLIKELY (res == -1))
return glnx_throw_errno (error); return glnx_throw_errno (error);
} }