From: Karel Zak <kzak@redhat.com>
Date: Tue, 27 May 2025 11:23:39 +0000 (+0200)
Subject: libmount: (monitor) require entry-specific functions
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=889de679802741c3ad28374b58408a45aa3c188b;p=thirdparty%2Futil-linux.git

libmount: (monitor) require entry-specific functions
---

diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
index 3890b18c2..663191326 100644
--- a/libmount/src/monitor.c
+++ b/libmount/src/monitor.c
@@ -189,8 +189,12 @@ int monitor_modify_epoll(struct libmnt_monitor *mn,
 
 	if (enable) {
 		struct epoll_event ev = { .events = me->events };
-		int fd = me->opers->op_get_fd(mn, me);
+		int fd;
 
+		assert(me->opers->op_get_fd);
+		assert(me->opers->op_process_event);
+
+		fd = me->opers->op_get_fd(mn, me);
 		if (fd < 0)
 			goto err;
 
@@ -347,8 +351,7 @@ int mnt_monitor_wait(struct libmnt_monitor *mn, int timeout)
 		if (!me)
 			return -EINVAL;
 
-		if (me->opers->op_process_event == NULL ||
-		    me->opers->op_process_event(mn, me) == 1) {
+		if (me->opers->op_process_event(mn, me) == 1) {
 			me->active = 1;
 			break;
 		}
@@ -418,8 +421,7 @@ int mnt_monitor_next_change(struct libmnt_monitor *mn,
 		if (!me)
 			return -EINVAL;
 
-		if (me->opers->op_process_event != NULL &&
-		    me->opers->op_process_event(mn, me) != 1)
+		if (me->opers->op_process_event(mn, me) != 1)
 			me = NULL;
 	}