Skip to contentSkip to conversation

kcmp: fs/epoll -- Wrap kcmp code with CONFIG_CHECKPOINT_RESTORE

PATCH Applied Cyrill Gorcunov 1 participant 1 message May 13, 2017

Subsystems (2)
VFS ABI/API
lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 kcmp: fs/epoll -- Wrap kcmp code with CONFIG_CHECKPOINT_RESTORE

kcmp syscall is build iif CONFIG_CHECKPOINT_RESTORE is selected, so wrap appropriate helpers in epoll code with the config to build it conditionally.

Signed-off-by Cyrill Gorcunov <[email protected]>
Reported-by Andrew Morton <[email protected]>
CC Andrey Vagin <[email protected]>
CC Al Viro <viro-RmSDqhL/[email protected]>
CC Pavel Emelyanov <[email protected]>
CC Michael Kerrisk <[email protected]>
CC Jason Baron <[email protected]>
CC Andy Lutomirski <[email protected]>
---
 fs/eventpoll.c            |    2 ++
 include/linux/eventpoll.h |    2 ++
 2 files changed, 4 insertions(+)
fs/eventpoll.c +2 -0
Index: linux-ml.git/fs/eventpoll.c
===================================================================
@@ -1077,6 +1077,7 @@ static struct epitem *ep_find(struct eve
 	return epir;
 }
 
+#ifdef CONFIG_CHECKPOINT_RESTORE
 static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff)
 {
 	struct rb_node *rbp;

@@ -1118,6 +1119,7 @@ struct file *get_epoll_tfile_raw_ptr(str
 
 	return file_raw;
 }
+#endif /* CONFIG_CHECKPOINT_RESTORE */
 
 /*
  * This is the callback that is passed to the wait queue wakeup
include/linux/eventpoll.h +2 -0
Index: linux-ml.git/include/linux/eventpoll.h
===================================================================
@@ -23,7 +23,9 @@ struct file;
 
 #ifdef CONFIG_EPOLL
 
+#ifdef CONFIG_CHECKPOINT_RESTORE
 struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff);
+#endif
 
 /* Used to initialize the epoll bits inside the "struct file" */
 static inline void eventpoll_init_file(struct file *file)