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

Merge pull request #1639 from alkino/master

Browse Source 
core dbus: Check that flush works with memstream
This commit is contained in:
Lennart Poettering
2015-10-21 21:01:21 +02:00
parent 91839b49dd 1f2f874c3c
commit 2dcc3c69a1
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-cgroup.c
+9 -3
View File
@@ -421,7 +421,9 @@ int bus_cgroup_set_property(
fprintf(f, "BlockIOWriteBandwidth=%s %" PRIu64 "\n", a->path, a->bandwidth);
}
fflush(f);
r = fflush_and_check(f);
if (r < 0)
return r;
unit_write_drop_in_private(u, mode, name, buf);
}
@@ -495,7 +497,9 @@ int bus_cgroup_set_property(
LIST_FOREACH(device_weights, a, c->blockio_device_weights)
fprintf(f, "BlockIODeviceWeight=%s %" PRIu64 "\n", a->path, a->weight);
fflush(f);
r = fflush_and_check(f);
if (r < 0)
return r;
unit_write_drop_in_private(u, mode, name, buf);
}
@@ -640,7 +644,9 @@ int bus_cgroup_set_property(
LIST_FOREACH(device_allow, a, c->device_allow)
fprintf(f, "DeviceAllow=%s %s%s%s\n", a->path, a->r ? "r" : "", a->w ? "w" : "", a->m ? "m" : "");
fflush(f);
r = fflush_and_check(f);
if (r < 0)
return r;
unit_write_drop_in_private(u, mode, name, buf);
}
src/core/dbus-service.c
+3 -1
View File
@@ -243,7 +243,9 @@ static int bus_service_set_transient_property(
a);
}
fflush(f);
r = fflush_and_check(f);
if (r < 0)
return r;
unit_write_drop_in_private(UNIT(s), mode, name, buf);
}