diff options
author | David S. Miller <davem@davemloft.net> | 2011-12-01 14:45:49 -0500 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:18 +0200 |
commit | 7ec212036c1e1400dace9b1aa64543c91f854705 (patch) | |
tree | 321562eb9a6cb5098bcc306510ef64d0255f5d8c | |
parent | c5e8459bd607a2b7c9a86ae4414f32ce3a7b3b62 (diff) |
dccp: Fix compile warning in probe code.
commit d984e6197ecd2babc1537f42dc1e676133005cda upstream.
Commit 1386be55e32a3c5d8ef4a2b243c530a7b664c02c ("dccp: fix
auto-loading of dccp(_probe)") fixed a bug but created a new
compiler warning:
net/dccp/probe.c: In function âdccpprobe_initâ:
net/dccp/probe.c:166:2: warning: the omitted middle operand in ?: will always be âtrueâ, suggest explicit middle operand [-Wparentheses]
try_then_request_module() is built for situations where the
"existence" test is some lookup function that returns a non-NULL
object on success, and with a reference count of some kind held.
Here we're looking for a success return of zero from the jprobe
registry.
Instead of fighting the way try_then_request_module() works, simply
open code what we want to happen in a local helper function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r-- | net/dccp/probe.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 3ba43b8c7617..89f25cb95603 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -151,6 +151,17 @@ static const struct file_operations dccpprobe_fops = { .read = dccpprobe_read, }; +static __init int setup_jprobe(void) +{ + int ret = register_jprobe(&dccp_send_probe); + + if (ret) { + request_module("dccp"); + ret = register_jprobe(&dccp_send_probe); + } + return ret; +} + static __init int dccpprobe_init(void) { int ret = -ENOMEM; @@ -164,8 +175,7 @@ static __init int dccpprobe_init(void) if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) goto err0; - try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0, - "dccp"); + ret = setup_jprobe(); if (ret) goto err1; |