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

Merge pull request #2526 from lucab/ups/openat-load-xattrs 

lib/repo: open file only if required
This commit is contained in:
Colin Walters 2022-01-25 05:59:58 -05:00 committed by GitHub
parent 0713ad3259 b27792ade3
commit bcc7f62ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4218,8 +4218,9 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
cancellable, error);
}
const gboolean need_open =
(out_fd || out_xattrs || self->mode == OSTREE_REPO_MODE_BARE_USER);
const gboolean need_open = (out_fd ||
(out_xattrs && self->mode == OSTREE_REPO_MODE_BARE) ||
self->mode == OSTREE_REPO_MODE_BARE_USER);
/* If it's a regular file and we're requested to return the fd, do it now. As
* a special case in bare-user, we always do an open, since the stat() metadata
* lives there.
@ -4284,10 +4285,8 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
ret_xattrs = g_variant_ref_sink (g_variant_builder_end (&builder));
}
}
else
else if (self->mode == OSTREE_REPO_MODE_BARE)
{
g_assert (self->mode == OSTREE_REPO_MODE_BARE);
if (S_ISREG (stbuf.st_mode) && out_xattrs)
{
if (self->disable_xattrs)
@ -4306,6 +4305,10 @@ _ostree_repo_load_file_bare (OstreeRepo *self,
return FALSE;
}
}
else
{
g_assert_not_reached ();
}
if (out_fd)
*out_fd = glnx_steal_fd (&fd);