Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Replace FMD_B_{TRUE,FALSE} with B_{TRUE,FALSE} 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12996
This commit is contained in:
наб 2022-01-22 03:41:47 +01:00 committed by Brian Behlendorf
parent a9e2b22efb
commit c21819026f
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zed/agents/fmd_api.c
View File

@ -342,11 +342,11 @@ fmd_case_uuresolved(fmd_hdl_t *hdl, const char *uuid)
fmd_hdl_debug(hdl, "case resolved by uuid (%s)", uuid); fmd_hdl_debug(hdl, "case resolved by uuid (%s)", uuid);
} }
int boolean_t
fmd_case_solved(fmd_hdl_t *hdl, fmd_case_t *cp) fmd_case_solved(fmd_hdl_t *hdl, fmd_case_t *cp)
{ {
(void) hdl; (void) hdl;
return ((cp->ci_state >= FMD_CASE_SOLVED) ? FMD_B_TRUE : FMD_B_FALSE); return (cp->ci_state >= FMD_CASE_SOLVED);
} }
void void
@ -560,7 +560,7 @@ fmd_serd_record(fmd_hdl_t *hdl, const char *name, fmd_event_t *ep)
if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) { if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
zed_log_msg(LOG_ERR, "failed to add record to SERD engine '%s'", zed_log_msg(LOG_ERR, "failed to add record to SERD engine '%s'",
name); name);
return (FMD_B_FALSE); return (0);
} }
err = fmd_serd_eng_record(sgp, ep->ev_hrt); err = fmd_serd_eng_record(sgp, ep->ev_hrt);

7
cmd/zed/agents/fmd_api.h
View File

@ -72,10 +72,6 @@ typedef struct fmd_case {
} fmd_case_t; } fmd_case_t;
#define FMD_B_FALSE 0 /* false value for booleans as int */
#define FMD_B_TRUE 1 /* true value for booleans as int */
#define FMD_CASE_UNSOLVED 0 /* case is not yet solved (waiting) */ #define FMD_CASE_UNSOLVED 0 /* case is not yet solved (waiting) */
#define FMD_CASE_SOLVED 1 /* case is solved (suspects added) */ #define FMD_CASE_SOLVED 1 /* case is solved (suspects added) */
#define FMD_CASE_CLOSE_WAIT 2 /* case is executing fmdo_close() */ #define FMD_CASE_CLOSE_WAIT 2 /* case is executing fmdo_close() */
@ -176,8 +172,7 @@ extern int fmd_case_uuclosed(fmd_hdl_t *, const char *);
extern int fmd_case_uuisresolved(fmd_hdl_t *, const char *); extern int fmd_case_uuisresolved(fmd_hdl_t *, const char *);
extern void fmd_case_uuresolved(fmd_hdl_t *, const char *); extern void fmd_case_uuresolved(fmd_hdl_t *, const char *);
extern int fmd_case_solved(fmd_hdl_t *, fmd_case_t *); extern boolean_t fmd_case_solved(fmd_hdl_t *, fmd_case_t *);
extern int fmd_case_closed(fmd_hdl_t *, fmd_case_t *);
extern void fmd_case_add_ereport(fmd_hdl_t *, fmd_case_t *, fmd_event_t *); extern void fmd_case_add_ereport(fmd_hdl_t *, fmd_case_t *, fmd_event_t *);
extern void fmd_case_add_serd(fmd_hdl_t *, fmd_case_t *, const char *); extern void fmd_case_add_serd(fmd_hdl_t *, fmd_case_t *, const char *);

6
cmd/zed/agents/fmd_serd.c
View File

@ -234,7 +234,7 @@ fmd_serd_eng_record(fmd_serd_eng_t *sgp, hrtime_t hrt)
if (sgp->sg_flags & FMD_SERD_FIRED) { if (sgp->sg_flags & FMD_SERD_FIRED) {
serd_log_msg(" SERD Engine: record %s already fired!", serd_log_msg(" SERD Engine: record %s already fired!",
sgp->sg_name); sgp->sg_name);
return (FMD_B_FALSE); return (B_FALSE);
} }
while (sgp->sg_count >= sgp->sg_n) while (sgp->sg_count >= sgp->sg_n)
@ -259,11 +259,11 @@ fmd_serd_eng_record(fmd_serd_eng_t *sgp, hrtime_t hrt)
fmd_event_delta(oep->se_hrt, sep->se_hrt) <= sgp->sg_t) { fmd_event_delta(oep->se_hrt, sep->se_hrt) <= sgp->sg_t) {
sgp->sg_flags |= FMD_SERD_FIRED | FMD_SERD_DIRTY; sgp->sg_flags |= FMD_SERD_FIRED | FMD_SERD_DIRTY;
serd_log_msg(" SERD Engine: fired %s", sgp->sg_name); serd_log_msg(" SERD Engine: fired %s", sgp->sg_name);
return (FMD_B_TRUE); return (B_TRUE);
} }
sgp->sg_flags |= FMD_SERD_DIRTY; sgp->sg_flags |= FMD_SERD_DIRTY;
return (FMD_B_FALSE); return (B_FALSE);
} }
int int