From 46d50eaf56eaee87e9ae0b5a5227b61a228a0fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Wed, 7 Apr 2021 15:35:10 +0200 Subject: [PATCH] zed: remove zed_conf::{min,max}_events and ZED_{MIN,MAX}_EVENTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No users, fields marked "reserved for future use", macros defined to 0 Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #11860 --- cmd/zed/zed.h | 10 ---------- cmd/zed/zed_conf.c | 2 -- cmd/zed/zed_conf.h | 2 -- 3 files changed, 14 deletions(-) diff --git a/cmd/zed/zed.h b/cmd/zed/zed.h index 68a90039a..8f2767d74 100644 --- a/cmd/zed/zed.h +++ b/cmd/zed/zed.h @@ -30,16 +30,6 @@ */ #define ZED_ZEDLET_DIR SYSCONFDIR "/zfs/zed.d" -/* - * Reserved for future use. - */ -#define ZED_MAX_EVENTS 0 - -/* - * Reserved for future use. - */ -#define ZED_MIN_EVENTS 0 - /* * String prefix for ZED variables passed via environment variables. */ diff --git a/cmd/zed/zed_conf.c b/cmd/zed/zed_conf.c index 0a6eea80d..5f895109d 100644 --- a/cmd/zed/zed_conf.c +++ b/cmd/zed/zed_conf.c @@ -43,8 +43,6 @@ zed_conf_create(void) if (!zcp) goto nomem; - zcp->min_events = ZED_MIN_EVENTS; - zcp->max_events = ZED_MAX_EVENTS; zcp->pid_fd = -1; zcp->zedlets = NULL; /* created via zed_conf_scan_dir() */ zcp->state_fd = -1; /* opened via zed_conf_open_state() */ diff --git a/cmd/zed/zed_conf.h b/cmd/zed/zed_conf.h index 8ad02f91b..c0691ddbc 100644 --- a/cmd/zed/zed_conf.h +++ b/cmd/zed/zed_conf.h @@ -26,8 +26,6 @@ struct zed_conf { unsigned do_verbose:1; /* true if verbosity enabled */ unsigned do_zero:1; /* true if zeroing state */ unsigned do_idle:1; /* true if idle enabled */ - int min_events; /* RESERVED FOR FUTURE USE */ - int max_events; /* RESERVED FOR FUTURE USE */ char *pid_file; /* abs path to pid file */ int pid_fd; /* fd to pid file for lock */ char *zedlet_dir; /* abs path to zedlet dir */