]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
unix: define and set show_fdinfo only if procfs is enabled
authorTobias Klauser <tklauser@distanz.ch>
Wed, 26 Feb 2020 17:29:53 +0000 (18:29 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Feb 2020 19:11:57 +0000 (11:11 -0800)
Follow the pattern used with other *_show_fdinfo functions and only
define unix_show_fdinfo and set it in proto_ops if CONFIG_PROCFS
is set.

Fixes: 3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo")
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/unix/af_unix.c

index 62c12cb5763e6d0ec4ef7daefd6836b6588b7185..aa6e2530e1ec62853844ec70be95d6652319cdf5 100644 (file)
@@ -682,6 +682,7 @@ static int unix_set_peek_off(struct sock *sk, int val)
        return 0;
 }
 
+#ifdef CONFIG_PROCFS
 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,