From: Arnd Bergmann <arnd@arndb.de>
To: "David S. Miller" <davem@davemloft.net>,
Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Jens Axboe <axboe@kernel.dk>,
Willem de Bruijn <willemb@google.com>,
Deepa Dinamani <deepa.kernel@gmail.com>,
Johannes Berg <johannes.berg@intel.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Pedro Tammela <pctammela@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] [net-next] socket: fix unused-function warning
Date: Tue, 7 Jan 2020 22:35:59 +0100 [thread overview]
Message-ID: <20200107213609.520236-1-arnd@arndb.de> (raw)
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)
Change the preprocessor conditional to a compiler conditional
to avoid the warning and let the compiler throw away the
function itself.
Fixes: b4653342b151 ("net: Allow to show socket-specific information in /proc/[pid]/fdinfo/[fd]")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/socket.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 5230c9e1bdec..444a617819f0 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -151,9 +151,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
+ .show_fdinfo = IS_ENABLED(CONFIG_PROC_FS) ? sock_show_fdinfo : NULL,
};
/*
--
2.20.0
next reply other threads:[~2020-01-07 21:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 21:35 Arnd Bergmann [this message]
2020-01-08 13:37 ` [PATCH] [net-next] socket: fix unused-function warning Kirill Tkhai
2020-01-08 21:27 ` David Miller
2020-01-08 21:40 ` Arnd Bergmann
2020-01-08 21:39 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107213609.520236-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=deepa.kernel@gmail.com \
--cc=johannes.berg@intel.com \
--cc=ktkhai@virtuozzo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pctammela@gmail.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.