diff options
| author | Florent Revest <revest@chromium.org> | 2020-12-04 14:36:04 +0300 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-12-05 00:32:40 +0300 |
| commit | dba4a9256bb4d78ef89aaad5f49787aa27fcd5b4 (patch) | |
| tree | 21572e1bceac8fd13f1c8a190b65316c8c1e8a66 /net/core/netclassid_cgroup.c | |
| parent | 5c667dca71095abec90420eb09503f35f66c9585 (diff) | |
| download | linux-dba4a9256bb4d78ef89aaad5f49787aa27fcd5b4.tar.xz | |
net: Remove the err argument from sock_from_file
Currently, the sock_from_file prototype takes an "err" pointer that is
either not set or set to -ENOTSOCK IFF the returned socket is NULL. This
makes the error redundant and it is ignored by a few callers.
This patch simplifies the API by letting callers deduce the error based
on whether the returned socket is NULL or not.
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Florent Revest <revest@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: KP Singh <kpsingh@google.com>
Link: https://lore.kernel.org/bpf/20201204113609.1850150-1-revest@google.com
Diffstat (limited to 'net/core/netclassid_cgroup.c')
| -rw-r--r-- | net/core/netclassid_cgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c index 41b24cd31562..b49c57d35a88 100644 --- a/net/core/netclassid_cgroup.c +++ b/net/core/netclassid_cgroup.c @@ -68,9 +68,8 @@ struct update_classid_context { static int update_classid_sock(const void *v, struct file *file, unsigned n) { - int err; struct update_classid_context *ctx = (void *)v; - struct socket *sock = sock_from_file(file, &err); + struct socket *sock = sock_from_file(file); if (sock) { spin_lock(&cgroup_sk_update_lock); |