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

core: Fall back to copying checkouts on EMLINK/EXDEV 

The previous fix to just ignore symbolic links for hard linking isn't
really good enough, since it can happen for empty files too.

Since this is an optimization, when we get EMLINK, let's instead just
fall back to copying.  This also applies to EXDEV.
This commit is contained in:
Colin Walters 2012-06-12 14:50:38 -04:00
parent 270dc05176
commit 35a80c8e39
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4115,39 +4115,49 @@ checkout_file_hardlink (OstreeRepo *self,
OstreeRepoCheckoutOverwriteMode overwrite_mode, OstreeRepoCheckoutOverwriteMode overwrite_mode,
GFile *source, GFile *source,
GFile *destination, GFile *destination,
gboolean *out_was_supported,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
gboolean ret_was_supported = FALSE;
ot_lobj GFile *dir = NULL; ot_lobj GFile *dir = NULL;
if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) < 0) if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) != -1)
ret_was_supported = TRUE;
else if (errno == EMLINK || errno == EXDEV)
{ {
if (errno == EEXIST && overwrite_mode == OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES) /* EMLINK and EXDEV shouldn't be fatal; we just can't do the
{ * optimization of hardlinking instead of copying.
/* Idiocy, from man rename(2) */
* ret_was_supported = FALSE;
* "If oldpath and newpath are existing hard links referring to }
* the same file, then rename() does nothing, and returns a else if (errno == EEXIST && overwrite_mode == OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES)
* success status." {
* /* Idiocy, from man rename(2)
* So we can't make this atomic. *
*/ * "If oldpath and newpath are existing hard links referring to
(void) unlink (ot_gfile_get_path_cached (destination)); * the same file, then rename() does nothing, and returns a
if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) < 0) * success status."
{ *
ot_util_set_error_from_errno (error, errno); * So we can't make this atomic.
goto out; */
} (void) unlink (ot_gfile_get_path_cached (destination));
} if (link (ot_gfile_get_path_cached (source), ot_gfile_get_path_cached (destination)) < 0)
else
{ {
ot_util_set_error_from_errno (error, errno); ot_util_set_error_from_errno (error, errno);
goto out; goto out;
} }
} }
else
{
ot_util_set_error_from_errno (error, errno);
goto out;
}
ret = TRUE; ret = TRUE;
if (out_was_supported)
*out_was_supported = ret_was_supported;
out: out:
return ret; return ret;
} }
@ -4214,6 +4224,7 @@ checkout_one_file (OstreeRepo *self,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
const char *checksum; const char *checksum;
gboolean hardlink_supported;
ot_lobj GFile *loose_path = NULL; ot_lobj GFile *loose_path = NULL;
ot_lobj GInputStream *input = NULL; ot_lobj GInputStream *input = NULL;
ot_lvariant GVariant *xattrs = NULL; ot_lvariant GVariant *xattrs = NULL;
@ -4235,12 +4246,14 @@ checkout_one_file (OstreeRepo *self,
if (loose_path) if (loose_path)
{ {
/* If we found one, we can just hardlink */ /* If we found one, try hardlinking */
if (!checkout_file_hardlink (self, mode, overwrite_mode, loose_path, destination, if (!checkout_file_hardlink (self, mode, overwrite_mode, loose_path, destination,
cancellable, error)) &hardlink_supported, cancellable, error))
goto out; goto out;
} }
else
/* Fall back to copy if there's no loose object, or we couldn't hardlink */
if (loose_path == NULL || !hardlink_supported)
{ {
if (!ostree_repo_load_file (self, checksum, &input, NULL, &xattrs, cancellable, error)) if (!ostree_repo_load_file (self, checksum, &input, NULL, &xattrs, cancellable, error))
goto out; goto out;