[Devel] [PATCH RHEL8 COMMIT] ms/socket: fix unused-function warning

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.34
------>
commit 2adb4361ac92174dbb511f281bf619a3213b307b
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Wed Jun 2 19:48:00 2021 +0300

    ms/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.
    
    mFixes: b4653342b151 ("net: Allow to show socket-specific information in /proc/[pid]/fdinfo/[fd]")
    Suggested-by: Al Viro <viro at zeniv.linux.org.uk>
    Acked-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    Signed-off-by: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    
    (cherry picked from ms commit 542d3065f2b1 ("socket: fix unused-function
    warning"))
    
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 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.