| Message ID | 20200227133442.18728-1-tklauser@distanz.ch |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v1] unix: define and set show_fdinfo only if procfs is enabled | expand |
From: Tobias Klauser <tklauser@distanz.ch> Date: Thu, 27 Feb 2020 14:34:42 +0100 > Follow the pattern used with other *_show_fdinfo functions and only > define unix_show_fdinfo and set it in proto_ops if CONFIG_PROC_FS > is set. > > Fixes: 3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo") > Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> I applied v0 before seeing this, so I just committed a relative fixup to the tree instead. Thanks.
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 62c12cb5763e..68debcb28fa4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -682,6 +682,7 @@ static int unix_set_peek_off(struct sock *sk, int val) return 0; } +#ifdef CONFIG_PROC_FS static void unix_show_fdinfo(struct seq_file *m, struct socket *sock) { struct sock *sk = sock->sk; @@ -692,6 +693,9 @@ static void unix_show_fdinfo(struct seq_file *m, struct socket *sock) seq_printf(m, "scm_fds: %u\n", READ_ONCE(u->scm_stat.nr_fds)); } } +#else +#define unix_show_fdinfo NULL +#endif static const struct proto_ops unix_stream_ops = { .family = PF_UNIX,
Follow the pattern used with other *_show_fdinfo functions and only define unix_show_fdinfo and set it in proto_ops if CONFIG_PROC_FS is set. Fixes: 3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo") Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- v1: - s/CONFIG_PROCFS/CONFIG_PROC_FS/ net/unix/af_unix.c | 4 ++++ 1 file changed, 4 insertions(+)