staging:lustre: remove useless libcfs_sock_release

There is no reason to have a one line exported function
libcfs_sock_release. Instead we can call sock_release directly.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index a789559b81c2c512cdf2d6b0f39582d39afd6ef8..f46933357bc387fa1339a5e49b5fc8cda690a71e 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -80,7 +80,6 @@ int libcfs_sock_getbuf(struct socket *socket, int *txbufsize, int *rxbufsize);
 int libcfs_sock_getaddr(struct socket *socket, int remote, __u32 *ip, int *port);
 int libcfs_sock_write(struct socket *sock, void *buffer, int nob, int timeout);
 int libcfs_sock_read(struct socket *sock, void *buffer, int nob, int timeout);
-void libcfs_sock_release(struct socket *sock);
 
 /* need both kernel and user-land acceptor */
 #define LNET_ACCEPTOR_MIN_RESERVED_PORT    512

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index 7b5d4078ba4e876a6124ce64bbb304b84907fde6..38e831f84abcb22f9f5bf2e01a59d53781cad8c0 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1386,7 +1386,7 @@ ksocknal_create_conn(lnet_ni_t *ni, ksock_route_t *route,
        LIBCFS_FREE(conn, sizeof(*conn));
 
  failed_0:
-       libcfs_sock_release(sock);
+       sock_release(sock);
        return rc;
 }
 

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index c34378c0220a77193b7653061b5cf8af7d602e06..06531c1d2ffb6684762eeed39f4e24b0fdbf1fee 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -519,7 +519,7 @@ ksocknal_connsock_decref(ksock_conn_t *conn)
        LASSERT(atomic_read(&conn->ksnc_sock_refcount) > 0);
        if (atomic_dec_and_test(&conn->ksnc_sock_refcount)) {
                LASSERT(conn->ksnc_closing);
-               libcfs_sock_release(conn->ksnc_sock);
+               sock_release(conn->ksnc_sock);
                conn->ksnc_sock = NULL;
                ksocknal_finalize_zcreq(conn);
        }

diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c
index 954f8d3fcebccea13448bf994e5a70b2d0f1f34c..1657106beab5f53316c4139e228915cf4eb4a2ca 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/acceptor.c
+++ b/drivers/staging/lustre/lnet/lnet/acceptor.c
@@ -197,7 +197,7 @@ lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
        goto failed;
 
  failed_sock:
-       libcfs_sock_release(sock);
+       sock_release(sock);
  failed:
        lnet_connect_console_error(rc, peer_nid, peer_ip, peer_port);
        return rc;
@@ -379,7 +379,7 @@ lnet_acceptor(void *arg)
 
                /* maybe we're waken up with libcfs_sock_abort_accept() */
                if (lnet_acceptor_state.pta_shutdown) {
-                       libcfs_sock_release(newsock);
+                       sock_release(newsock);
                        break;
                }
 
@@ -410,10 +410,10 @@ lnet_acceptor(void *arg)
                continue;
 
 failed:
-               libcfs_sock_release(newsock);
+               sock_release(newsock);
        }
 
-       libcfs_sock_release(lnet_acceptor_state.pta_sock);
+       sock_release(lnet_acceptor_state.pta_sock);
        lnet_acceptor_state.pta_sock = NULL;
 
        CDEBUG(D_NET, "Acceptor stopping\n");

diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c
index 7f80612cd3e52508c0d74760d41ac8c1d2e12e7f..259db61e216a798de091c912754bea6ca3215d84 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-socket.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c
@@ -614,11 +614,3 @@ libcfs_sock_connect (struct socket **sockp, int *fatal,
 }
 
 EXPORT_SYMBOL(libcfs_sock_connect);
-
-void
-libcfs_sock_release (struct socket *sock)
-{
-       sock_release(sock);
-}
-
-EXPORT_SYMBOL(libcfs_sock_release);