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: b4653342b151 ("net: Allow to show socket-specific information in
/proc/[pid]/fdinfo/[fd]")
Suggested-by: Al Viro <[email protected]>
Acked-by: Kirill Tkhai <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
(cherry picked from commit 542d3065f2b1a60a0cfc259c9a36faa470761d78)
Signed-off-by: Vasily Averin <[email protected]>
---
net/socket.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index bbd3c9dd2b1d..68d06fd92a3c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -140,7 +140,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
@@ -163,9 +174,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
};
/*
@@ -990,14 +999,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.
--
2.25.1
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
