SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: move logging from varlink clients in nsresource.c/dissect-image.c into callers

Browse Source 
These calls are "library-like", hence better should only debug log on
their own, not more.
This commit is contained in:
Lennart Poettering
2026-02-19 15:05:15 +01:00
parent 1bc237dd7a
commit 116394f7ce
8 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/import/export-tar.c
+1 -1
View File
@@ -365,7 +365,7 @@ int tar_export_start(
_cleanup_close_ int mapped_fd = -EBADF;
r = mountfsd_mount_directory_fd(directory_fd, e->userns_fd, DISSECT_IMAGE_FOREIGN_UID, &mapped_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to mount directory via mountfsd: %m");
/* Drop O_PATH */
e->tree_fd = fd_reopen(mapped_fd, O_DIRECTORY|O_CLOEXEC);
src/import/import-tar.c
+2 -2
View File
@@ -259,11 +259,11 @@ static int tar_import_fork_tar(TarImport *i) {
_cleanup_close_ int directory_fd = -EBADF;
r = mountfsd_make_directory(d, MODE_INVALID, /* flags= */ 0, &directory_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to make directory via mountfsd: %m");
r = mountfsd_mount_directory_fd(directory_fd, i->userns_fd, DISSECT_IMAGE_FOREIGN_UID, &i->tree_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed mount directory via mountfsd: %m");
} else {
if (i->flags & IMPORT_BTRFS_SUBVOL)
r = btrfs_subvol_make_fallback(AT_FDCWD, d, 0755);
src/import/pull-tar.c
+5 -5
View File
@@ -296,18 +296,18 @@ static int tar_pull_make_local_copy(TarPull *p) {
r = mountfsd_mount_directory_fd(directory_fd, p->userns_fd, DISSECT_IMAGE_FOREIGN_UID, &p->tree_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to mount directory via mountfsd: %m");
}
_cleanup_close_ int directory_fd = -EBADF;
r = mountfsd_make_directory(t, MODE_INVALID, /* flags= */ 0, &directory_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to make directory via mountfsd: %m");
_cleanup_close_ int copy_fd = -EBADF;
r = mountfsd_mount_directory_fd(directory_fd, p->userns_fd, DISSECT_IMAGE_FOREIGN_UID, &copy_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to mount directory via mountfsd: %m");
r = copy_tree_at_foreign(p->tree_fd, copy_fd, p->userns_fd);
if (r < 0)
@@ -614,11 +614,11 @@ static int tar_pull_job_on_open_disk_tar(PullJob *j) {
_cleanup_close_ int directory_fd = -EBADF;
r = mountfsd_make_directory(where, MODE_INVALID, /* flags= */ 0, &directory_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to make directory via mountfsd: %m");
r = mountfsd_mount_directory_fd(directory_fd, p->userns_fd, DISSECT_IMAGE_FOREIGN_UID, &p->tree_fd);
if (r < 0)
return r;
return log_error_errno(r, "Failed to mount directory via mountfsd: %m");
} else {
if (p->flags & IMPORT_BTRFS_SUBVOL)
r = btrfs_subvol_make_fallback(AT_FDCWD, where, 0755);