diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-06 14:46:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-06 14:46:38 -0500 |
| commit | 409e145643d66d5307fbd4ec1a0addfef95ef1c3 (patch) | |
| tree | 399fe3c584aaf3a9c71d770e5ae00d55e50e0841 /net/tipc/handler.c | |
| parent | 9e9cb6221aa7cb04765484fe87cc2d1b92edce64 (diff) | |
| parent | 2892505ea170094f982516bb38105eac45f274b1 (diff) | |
Merge branch 'tipc'
Eric Hugne says:
====================
tipc: refcount and memory leak fixes
v3: Remove error logging from data path completely. Rebased on top of
latest net merge.
v2: Drop specific -ENOMEM logging in patch #1 (tipc: allow connection
shutdown callback to be invoked in advance) And add a general error
message if an internal server tries to send a message on a
closed/nonexisting connection.
In addition to the fix for refcount leak and memory leak during
module removal, we also fix a problem where the topology server
listening socket where unexpectedly closed. We also eliminate an
unnecessary context switch during accept()/recvmsg() for nonblocking
sockets.
It might be good to include this patchset in stable aswell. After the
v3 rebase on latest merge from net all patches apply cleanly on that
tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/handler.c')
| -rw-r--r-- | net/tipc/handler.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index e4bc8a29674..1fabf160501 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c @@ -58,7 +58,6 @@ unsigned int tipc_k_signal(Handler routine, unsigned long argument) spin_lock_bh(&qitem_lock); if (!handler_enabled) { - pr_err("Signal request ignored by handler\n"); spin_unlock_bh(&qitem_lock); return -ENOPROTOOPT; } |