openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Simmons 2015-06-08 22:27:08 -04:00 committed by Greg Kroah-Hartman
parent 7da308e1c4
commit e52fc91d40
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/lustre/include/linux/libcfs/libcfs.h
View File

@ -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

2
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
View File

@ -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;
}

2
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
View File

@ -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);
}

8
drivers/staging/lustre/lnet/lnet/acceptor.c
View File

@ -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");

8
drivers/staging/lustre/lnet/lnet/lib-socket.c
View File

@ -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);