diff options
| -rw-r--r-- | net/socket.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/net/socket.c b/net/socket.c index 51bf34995bcb..b79a05de7c6e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -128,7 +128,18 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); -static void sock_show_fdinfo(struct seq_file *m, struct file *f); + +#ifdef CONFIG_PROC_FS +static void sock_show_fdinfo(struct seq_file *m, struct file *f) +{ + struct socket *sock = f->private_data; + + if (sock->ops->show_fdinfo) + sock->ops->show_fdinfo(m, sock); +} +#else +#define sock_show_fdinfo NULL +#endif /* * Socket files have a set of 'special' operations as well as the generic file ones. These don't appear @@ -151,9 +162,7 @@ static const struct file_operations socket_file_ops = { .sendpage = sock_sendpage, .splice_write = generic_splice_sendpage, .splice_read = sock_splice_read, -#ifdef CONFIG_PROC_FS .show_fdinfo = sock_show_fdinfo, -#endif }; /* @@ -997,14 +1006,6 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from) return res; } -static void sock_show_fdinfo(struct seq_file *m, struct file *f) -{ - struct socket *sock = f->private_data; - - if (sock->ops->show_fdinfo) - sock->ops->show_fdinfo(m, sock); -} - /* * Atomic setting of ioctl hooks to avoid race * with module unload. |