From fd784d3c884b8322c7195e49518b2f3a173c2b38 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 29 Nov 2012 14:19:20 +1100 Subject: [PATCH] fs, notify: Move bare fdinfo helpers to a header Otherwise if the kernel gets build without procfs support we will have build error | fs/notify/inotify/inotify_user.c:333:17: error: 'inotify_show_fdinfo' undeclared here (not in a function) Signed-off-by: Cyrill Gorcunov Reported-by: Wu Fengguang Signed-off-by: Andrew Morton --- fs/notify/fdinfo.c | 5 ----- fs/notify/fdinfo.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c index 62db6b6161a0..6f94c3dc54d2 100644 --- a/fs/notify/fdinfo.c +++ b/fs/notify/fdinfo.c @@ -145,9 +145,4 @@ int fanotify_show_fdinfo(struct seq_file *m, struct file *f) #endif /* CONFIG_INOTIFY_USER || CONFIG_FANOTIFY */ -#else /* CONFIG_PROC_FS */ - -#define inotify_show_fdinfo NULL -#define fanotify_show_fdinfo NULL - #endif /* CONFIG_PROC_FS */ diff --git a/fs/notify/fdinfo.h b/fs/notify/fdinfo.h index 49939619e987..556afda990e9 100644 --- a/fs/notify/fdinfo.h +++ b/fs/notify/fdinfo.h @@ -17,6 +17,11 @@ extern int inotify_show_fdinfo(struct seq_file *m, struct file *f); extern int fanotify_show_fdinfo(struct seq_file *m, struct file *f); #endif +#else /* CONFIG_PROC_FS */ + +#define inotify_show_fdinfo NULL +#define fanotify_show_fdinfo NULL + #endif /* CONFIG_PROC_FS */ #endif /* __FSNOTIFY_FDINFO_H__ */ -- 2.39.5