UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

socket: fix unused-function warning 

When procfs is disabled, the fdinfo code causes a harmless
warning:

net/socket.c:1000:13: error: 'sock_show_fdinfo' defined but not used [-Werror=unused-function]
 static void sock_show_fdinfo(struct seq_file *m, struct file *f)

Move the function definition up so we can use a single #ifdef
around it.

Fixes: b4653342b1 ("net: Allow to show socket-specific information in /proc/[pid]/fdinfo/[fd]")
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2020-01-08 22:44:43 +01:00 committed by David S. Miller
parent daea5b4dc1
commit 542d3065f2
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/socket.c
View File

@ -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, static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len, struct pipe_inode_info *pipe, size_t len,
unsigned int flags); 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 * 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, .sendpage = sock_sendpage,
.splice_write = generic_splice_sendpage, .splice_write = generic_splice_sendpage,
.splice_read = sock_splice_read, .splice_read = sock_splice_read,
#ifdef CONFIG_PROC_FS
.show_fdinfo = sock_show_fdinfo, .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; 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 * Atomic setting of ioctl hooks to avoid race
* with module unload. * with module unload.