src/core/manager.c

@@ -2278,11 +2278,6 @@ int manager_propagate_reload(Manager *m, Unit *unit, JobMode mode, sd_bus_error
                         tr->anchor_job,
                         mode == JOB_IGNORE_DEPENDENCIES ? TRANSACTION_IGNORE_ORDER : 0);
 
-        /* Only activate the transaction if it contains jobs other than NOP anchor.
-         * Short-circuiting here avoids unnecessary processing, such as emitting D-Bus signals. */
-        if (hashmap_size(tr->jobs) <= 1)
-                return 0;
-
         r = transaction_activate(tr, m, mode, NULL, e);
         if (r < 0)
                 return r;

src/cryptenroll/cryptenroll.c

@@ -850,7 +850,7 @@ static int run(int argc, char *argv[]) {
                 return r;
 
         /* A delicious drop of snake oil */
-        (void) mlockall(MCL_CURRENT|MCL_FUTURE|MCL_ONFAULT);
+        (void) mlockall(MCL_FUTURE);
 
         cryptsetup_enable_logging(NULL);
 

src/cryptsetup/cryptsetup.c

@@ -2582,7 +2582,7 @@ static int verb_attach(int argc, char *argv[], void *userdata) {
                   volume, source, strempty(arg_type), strempty(arg_cipher));
 
         /* A delicious drop of snake oil */
-        (void) mlockall(MCL_CURRENT|MCL_FUTURE|MCL_ONFAULT);
+        (void) mlockall(MCL_FUTURE);
 
         if (key_file && arg_keyfile_erase)
                 destroy_key_file = key_file; /* let's get this baby erased when we leave */

src/shutdown/shutdown.c

@@ -402,8 +402,7 @@ int main(int argc, char *argv[]) {
         init_watchdog();
 
         /* Lock us into memory */
-        (void) mlockall(MCL_FUTURE|MCL_ONFAULT);
-        (void) mlockall(MCL_CURRENT);
+        (void) mlockall(MCL_CURRENT|MCL_FUTURE);
 
         /* We need to make mounts private so that we can MS_MOVE in unmount_all(). Kernel does not allow
          * MS_MOVE when parent mountpoints have shared propagation. */