dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 17:10:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33560 from YHNdnzj/trivial-cleanup-2

Browse Source 
2 trivial follow-ups for recent PRs
This commit is contained in:
Luca Boccassi
2024-07-02 10:05:49 +02:00
committed by GitHub
parent aedc4f77d1 0ee63608bc
commit 1b3dc17624
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/condition.c
View File

@@ -1008,8 +1008,8 @@ static int condition_test_psi(Condition *c, char **env) {
const char *p, *value, *pressure_type;
loadavg_t *current, limit;
ResourcePressure pressure;
int r;
PressureType preferred_pressure_type = PRESSURE_TYPE_FULL;
int r;
assert(c);
assert(c->parameter);
@@ -1031,7 +1031,7 @@ static int condition_test_psi(Condition *c, char **env) {
/* If only one parameter is passed, then we look at the global system pressure rather than a specific cgroup. */
if (r == 1) {
/* cpu.pressure 'full' is reported but undefined at system level */
if(c->type == CONDITION_CPU_PRESSURE)
if (c->type == CONDITION_CPU_PRESSURE)
preferred_pressure_type = PRESSURE_TYPE_SOME;
pressure_path = path_join("/proc/pressure", pressure_type);

17
src/shared/mount-util.h
View File

@@ -83,19 +83,22 @@ int mount_flags_to_string(unsigned long flags, char **ret);
/* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */
static inline char* umount_and_rmdir_and_free(char *p) {
if (!p)
return NULL;
PROTECT_ERRNO;
if (p) {
(void) umount_recursive(p, 0);
(void) rmdir(p);
}
(void) umount_recursive(p, 0);
(void) rmdir(p);
return mfree(p);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_rmdir_and_free);
static inline char *umount_and_free(char *p) {
static inline char* umount_and_free(char *p) {
if (!p)
return NULL;
PROTECT_ERRNO;
if (p)
(void) umount_recursive(p, 0);
(void) umount_recursive(p, 0);
return mfree(p);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_free);