morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

remount-fs: minor coding style cleanups

Browse Source
This commit is contained in:
Mike Yuan
2025-09-14 21:03:15 +02:00
parent 69fa2b6303
commit 7ebb2b3349
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/remount-fs/remount-fs.c
View File

@@ -35,10 +35,8 @@ static int track_pid(Hashmap **h, const char *path, pid_t pid) {
return log_oom();
r = hashmap_ensure_put(h, &trivial_hash_ops_value_free, PID_TO_PTR(pid), c);
if (r == -ENOMEM)
return log_oom();
if (r < 0)
return log_error_errno(r, "Failed to store pid " PID_FMT, pid);
return log_error_errno(r, "Failed to store pid " PID_FMT " for mount '%s': %m", pid, path);
TAKE_PTR(c);
return 0;
@@ -48,6 +46,8 @@ static int do_remount(const char *path, bool force_rw, Hashmap **pids) {
pid_t pid;
int r;
assert(path);
log_debug("Remounting %s...", path);
r = safe_fork(force_rw ? "(remount-rw)" : "(remount)",
@@ -98,7 +98,7 @@ static int remount_by_fstab(Hashmap **ret_pids) {
if (path_equal(me->mnt_dir, "/"))
has_root = true;
r = do_remount(me->mnt_dir, false, &pids);
r = do_remount(me->mnt_dir, /* force_rw = */ false, &pids);
if (r < 0)
return r;
}
@@ -132,7 +132,7 @@ static int run(int argc, char *argv[]) {
log_warning_errno(r, "Failed to parse $SYSTEMD_REMOUNT_ROOT_RW, ignoring: %m");
if (r > 0) {
r = do_remount("/", true, &pids);
r = do_remount("/", /* force_rw = */ true, &pids);
if (r < 0)
return r;
}