Print this page
re #13388 rb4382 fmd_api.h uses bool which is a C99/C++ keyword

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fm/fmd/common/fmd_ckpt.c
          +++ new/usr/src/cmd/fm/fmd/common/fmd_ckpt.c
↓ open down ↓ 769 lines elided ↑ open up ↑
 770  770          hrtime_t now = gethrtime();
 771  771          fmd_ckpt_t ckp;
 772  772          int err;
 773  773  
 774  774          ASSERT(fmd_module_locked(mp));
 775  775  
 776  776          /*
 777  777           * If checkpointing is disabled for the module, just return.  We must
 778  778           * commit the module state anyway to transition pending log events.
 779  779           */
 780      -        if (mp->mod_stats->ms_ckpt_save.fmds_value.bool == FMD_B_FALSE) {
      780 +        if (mp->mod_stats->ms_ckpt_save.fmds_value.b == FMD_B_FALSE) {
 781  781                  fmd_module_commit(mp);
 782  782                  return;
 783  783          }
 784  784  
 785  785          if (!(mp->mod_flags & (FMD_MOD_MDIRTY | FMD_MOD_CDIRTY)))
 786  786                  return; /* no checkpoint is necessary for this module */
 787  787  
 788  788          TRACE((FMD_DBG_CKPT, "ckpt save begin %s %llu",
 789  789              mp->mod_name, mp->mod_gen + 1));
 790  790  
↓ open down ↓ 356 lines elided ↑ open up ↑
1147 1147  /*
1148 1148   * Restore a checkpoint for the specified module.  Any errors which occur
1149 1149   * during restore will call fmd_ckpt_error() or trigger an fmd_api_error(),
1150 1150   * either of which will automatically unlock the module and trigger an abort.
1151 1151   */
1152 1152  void
1153 1153  fmd_ckpt_restore(fmd_module_t *mp)
1154 1154  {
1155 1155          fmd_ckpt_t ckp;
1156 1156  
1157      -        if (mp->mod_stats->ms_ckpt_restore.fmds_value.bool == FMD_B_FALSE)
     1157 +        if (mp->mod_stats->ms_ckpt_restore.fmds_value.b == FMD_B_FALSE)
1158 1158                  return; /* never restore checkpoints for this module */
1159 1159  
1160 1160          TRACE((FMD_DBG_CKPT, "ckpt restore begin %s", mp->mod_name));
1161 1161  
1162 1162          if (fmd_ckpt_open(&ckp, mp) == -1) {
1163 1163                  if (errno != ENOENT)
1164 1164                          fmd_error(EFMD_CKPT_OPEN, "can't open %s", ckp.ckp_src);
1165 1165                  TRACE((FMD_DBG_CKPT, "ckpt restore end %s", mp->mod_name));
1166 1166                  return;
1167 1167          }
↓ open down ↓ 46 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX