gnu/packages/patches/multipath-tools-sans-systemd.patch

   1 Fix various compiler warnings when built without systemd.
   2
   3 Submitted upstream at <https://www.redhat.com/archives/dm-devel/2020-May/thread.html>.
   4
   5 diff --git a/libmultipath/config.c b/libmultipath/config.c
   6 --- a/libmultipath/config.c
   7 +++ b/libmultipath/config.c
   8 @@ -696,7 +696,7 @@ process_config_dir(struct config *conf, char *dir)
   9         pthread_cleanup_pop(1);
  10  }
  11
  12 -static void set_max_checkint_from_watchdog(struct config *conf)
  13 +static void set_max_checkint_from_watchdog(__attribute__((unused)) struct config *conf)
  14  {
  15  #ifdef USE_SYSTEMD
  16         char *envp = getenv("WATCHDOG_USEC");
  17 diff --git a/multipathd/main.c b/multipathd/main.c
  18 --- a/multipathd/main.c
  19 +++ b/multipathd/main.c
  20 @@ -176,6 +176,7 @@ daemon_status(void)
  21  /*
  22   * I love you too, systemd ...
  23   */
  24 +#ifdef USE_SYSTEMD
  25  static const char *
  26  sd_notify_status(enum daemon_status state)
  27  {
  28 @@ -195,7 +196,6 @@ sd_notify_status(enum daemon_status state)
  29         return NULL;
  30  }
  31
  32 -#ifdef USE_SYSTEMD
  33  static void do_sd_notify(enum daemon_status old_state,
  34                          enum daemon_status new_state)
  35  {
  36 @@ -247,7 +247,9 @@ enum daemon_status wait_for_state_change_if(enum daemon_status oldstate,
  37  static void __post_config_state(enum daemon_status state)
  38  {
  39         if (state != running_state && running_state != DAEMON_SHUTDOWN) {
  40 -               enum daemon_status old_state = running_state;
  41 +               /* save state for sd_notify */
  42 +               enum daemon_status
  43 +                       __attribute__((unused)) old_state = running_state;
  44
  45                 running_state = state;
  46                 pthread_cond_broadcast(&config_cond);
  47 @@ -272,7 +274,9 @@ int set_config_state(enum daemon_status state)
  48         pthread_cleanup_push(config_cleanup, NULL);
  49         pthread_mutex_lock(&config_lock);
  50         if (running_state != state) {
  51 -               enum daemon_status old_state = running_state;
  52 +               /* save state for sd_notify */
  53 +               enum daemon_status
  54 +                       __attribute__((unused)) old_state = running_state;
  55
  56                 if (running_state == DAEMON_SHUTDOWN)
  57                         rc = EINVAL;
  58 @@ -2280,7 +2284,6 @@ checkerloop (void *ap)
  59         struct timespec last_time;
  60         struct config *conf;
  61         int foreign_tick = 0;
  62 -       bool use_watchdog;
  63
  64         pthread_cleanup_push(rcu_unregister, NULL);
  65         rcu_register_thread();
  66 @@ -2292,11 +2295,15 @@ checkerloop (void *ap)
  67         get_monotonic_time(&last_time);
  68         last_time.tv_sec -= 1;
  69
  70 -       /* use_watchdog is set from process environment and never changes */
  71         conf = get_multipath_config();
  72 -       use_watchdog = conf->use_watchdog;
  73         put_multipath_config(conf);
  74
  75 +#ifdef USE_SYSTEMD
  76 +       /* use_watchdog is set from process environment and never changes */
  77 +       bool use_watchdog;
  78 +       use_watchdog = conf->use_watchdog;
  79 +#endif
  80 +
  81         while (1) {
  82                 struct timespec diff_time, start_time, end_time;
  83                 int num_paths = 0, strict_timing, rc = 0;