[Devel,RHEL7,COMMIT] ms/kcmp: fs/epoll: wrap kcmp code with CONFIG_CHECKPOINT_RESTORE

Submitted by Konstantin Khorenko on May 31, 2017, 1:25 p.m.

Details

Message ID 201705311325.v4VDPxbD018455@finist_cl7.x64_64.work.ct
State New
Series "ms/kcmp: fs/epoll: wrap kcmp code with CONFIG_CHECKPOINT_RESTORE"
Headers show

Commit Message

Konstantin Khorenko May 31, 2017, 1:25 p.m.
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.32.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.32.5
------>
commit 6f6206b5a023a907f3e443c31194d75791e600dc
Author: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date:   Wed May 31 17:25:59 2017 +0400

    ms/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.
    
    https://jira.sw.ru/browse/PSBM-60161
    
    Link: http://lkml.kernel.org/r/20170513083456.GG1881@uranus.lan
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    
    Reported-by: Andrew Morton <akpm@linuxfoundation.org>
    Cc: Andrey Vagin <avagin@openvz.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Pavel Emelyanov <xemul@virtuozzo.com>
    Cc: Michael Kerrisk <mtk.manpages@gmail.com>
    Cc: Jason Baron <jbaron@akamai.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 fs/eventpoll.c            | 2 ++
 include/linux/eventpoll.h | 2 ++
 2 files changed, 4 insertions(+)

Patch hide | download patch | download mbox

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index b0aeaeb..c675c24 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1001,6 +1001,7 @@  static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd)
 	return epir;
 }
 
+#ifdef CONFIG_CHECKPOINT_RESTORE
 static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff)
 {
 	struct rb_node *rbp;
@@ -1042,6 +1043,7 @@  struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd,
 
 	return file_raw;
 }
+#endif /* CONFIG_CHECKPOINT_RESTORE */
 
 /*
  * This is the callback that is passed to the wait queue wakeup
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f2b07df..5928015 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -22,7 +22,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)