From f10b348e963aaa9514beea0ce7972c0ea3a1c2a4 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Mon, 6 Feb 2017 13:44:12 +0200 Subject: [PATCH] util: introduce epoll_del_rfd travis-ci: success for lazy-pages: add non-#PF events handling (rev2) Signed-off-by: Mike Rapoport Signed-off-by: Pavel Emelyanov --- criu/include/util.h | 1 + criu/util.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/criu/include/util.h b/criu/include/util.h index 63810b493..bf466f5d6 100644 --- a/criu/include/util.h +++ b/criu/include/util.h @@ -323,6 +323,7 @@ struct epoll_rfd { }; extern int epoll_add_rfd(int epfd, struct epoll_rfd *); +extern int epoll_del_rfd(int epfd, struct epoll_rfd *rfd); extern int epoll_run_rfds(int epfd, struct epoll_event *evs, int nr_fds, int tmo); extern int epoll_prepare(int nr_events, struct epoll_event **evs); diff --git a/criu/util.c b/criu/util.c index 8be400e37..b681daf9b 100644 --- a/criu/util.c +++ b/criu/util.c @@ -1228,6 +1228,16 @@ int epoll_add_rfd(int epfd, struct epoll_rfd *rfd) return 0; } +int epoll_del_rfd(int epfd, struct epoll_rfd *rfd) +{ + if (epoll_ctl(epfd, EPOLL_CTL_DEL, rfd->fd, NULL) == -1) { + pr_perror("epoll_ctl failed"); + return -1; + } + + return 0; +} + int epoll_run_rfds(int epollfd, struct epoll_event *evs, int nr_fds, int timeout) { int ret, i, nr_events;