tipc: eliminate function tipc_port_shutdown()

tipc_port_shutdown() is a remnant from the now obsolete native
interface. As such it grabs port_lock in order to protect itself
from concurrent BH processing.

However, after the recent changes to the port/socket upcalls, sockets
are now basically single-threaded, and all execution, except the read-only
tipc_sk_timer(), is executing within the protection of lock_sock(). So
the use of port_lock is not needed here.

In this commit we eliminate the whole function, and merge it into its
only caller, tipc_shutdown().

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 6de79f26981e30fa70adb66c2e8fc52e10907469..3ad092b7fb7d1bdf3a66e4ac97cd5f1fce95ce39 100644 (file)
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -385,27 +385,3 @@ int tipc_port_disconnect(u32 ref)
        tipc_port_unlock(p_ptr);
        return res;
 }
-
-/*
- * tipc_port_shutdown(): Send a SHUTDOWN msg to peer and disconnect
- */
-int tipc_port_shutdown(u32 ref)
-{
-       struct tipc_msg *msg;
-       struct tipc_port *p_ptr;
-       struct sk_buff *buf = NULL;
-       u32 peer_node;
-
-       p_ptr = tipc_port_lock(ref);
-       if (!p_ptr)
-               return -EINVAL;
-       peer_node = tipc_port_peernode(p_ptr);
-       buf = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,
-                             SHORT_H_SIZE, 0, peer_node,
-                             tipc_own_addr, tipc_port_peerport(p_ptr),
-                             p_ptr->ref, TIPC_CONN_SHUTDOWN);
-       tipc_port_unlock(p_ptr);
-       msg = buf_msg(buf);
-       tipc_link_xmit(buf, peer_node,  msg_link_selector(msg));
-       return tipc_port_disconnect(ref);
-}

diff --git a/net/tipc/port.h b/net/tipc/port.h
index 6cdc7de8c9b859e3ddaa4ee08ec49a2a2e21e71b..f5762f940e338649e643b5b388a7f03f3852b301 100644 (file)
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -106,8 +106,6 @@ int tipc_port_connect(u32 portref, struct tipc_portid const *port);
 
 int tipc_port_disconnect(u32 portref);
 
-int tipc_port_shutdown(u32 ref);
-
 /*
  * The following routines require that the port be locked on entry
  */

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 5f8376e8da2a417228ed4fbf1b97316f6b773406..f202d4790ce3068dcc6ddcc42459d29ab8cd1c1e 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1899,7 +1899,7 @@ static int tipc_shutdown(struct socket *sock, int how)
        struct tipc_sock *tsk = tipc_sk(sk);
        struct tipc_port *port = &tsk->port;
        struct sk_buff *buf;
-       u32 peer;
+       u32 dnode;
        int res;
 
        if (how != SHUT_RDWR)
@@ -1920,10 +1920,17 @@ static int tipc_shutdown(struct socket *sock, int how)
                                goto restart;
                        }
                        tipc_port_disconnect(port->ref);
-                       if (tipc_msg_reverse(buf, &peer, TIPC_CONN_SHUTDOWN))
-                               tipc_link_xmit(buf, peer, 0);
+                       if (tipc_msg_reverse(buf, &dnode, TIPC_CONN_SHUTDOWN))
+                               tipc_link_xmit(buf, dnode, port->ref);
                } else {
-                       tipc_port_shutdown(port->ref);
+                       dnode = tipc_port_peernode(port);
+                       buf = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,
+                                             TIPC_CONN_MSG, SHORT_H_SIZE,
+                                             0, dnode, tipc_own_addr,
+                                             tipc_port_peerport(port),
+                                             port->ref, TIPC_CONN_SHUTDOWN);
+                       tipc_link_xmit(buf, dnode, port->ref);
+                       __tipc_port_disconnect(port);
                }
 
                sock->state = SS_DISCONNECTING;