evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging:lustre: remove useless libcfs_sock_abort_accept

Browse source 
Another one of those silly one line wrappers which is not
needed. Replace libcfs_sock_abort_accept wrapper with a
direct call to wake_up_all on the lnet_acceptor_state sock.

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:09 -04:00 • committed by Greg Kroah-Hartman
parent e52fc91d40
commit 45bd3ebe32
3 changed files with 2 additions and 11 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

@ -71,7 +71,6 @@ int libcfs_ipif_enumerate(char ***names);
void libcfs_ipif_free_enumeration(char **names, int n); void libcfs_ipif_free_enumeration(char **names, int n);
int libcfs_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog); int libcfs_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog);
int libcfs_sock_accept(struct socket **newsockp, struct socket *sock); int libcfs_sock_accept(struct socket **newsockp, struct socket *sock);
void libcfs_sock_abort_accept(struct socket *sock);
int libcfs_sock_connect(struct socket **sockp, int *fatal, int libcfs_sock_connect(struct socket **sockp, int *fatal,
__u32 local_ip, int local_port, __u32 local_ip, int local_port,
__u32 peer_ip, int peer_port); __u32 peer_ip, int peer_port);

4
drivers/staging/lustre/lnet/lnet/acceptor.c
View file

@ -377,7 +377,7 @@ lnet_acceptor(void *arg)
continue; continue;
} }
/* maybe we're waken up with libcfs_sock_abort_accept() */ /* maybe the LNet acceptor thread has been waken */
if (lnet_acceptor_state.pta_shutdown) { if (lnet_acceptor_state.pta_shutdown) {
sock_release(newsock); sock_release(newsock);
break; break;
@ -493,7 +493,7 @@ lnet_acceptor_stop(void)
return; return;
lnet_acceptor_state.pta_shutdown = 1; lnet_acceptor_state.pta_shutdown = 1;
libcfs_sock_abort_accept(lnet_acceptor_state.pta_sock); wake_up_all(sk_sleep(lnet_acceptor_state.pta_sock->sk));
/* block until acceptor signals exit */ /* block until acceptor signals exit */
wait_for_completion(&lnet_acceptor_state.pta_signal); wait_for_completion(&lnet_acceptor_state.pta_signal);

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

@ -568,14 +568,6 @@ libcfs_sock_accept (struct socket **newsockp, struct socket *sock)
EXPORT_SYMBOL(libcfs_sock_accept); EXPORT_SYMBOL(libcfs_sock_accept);
void
libcfs_sock_abort_accept (struct socket *sock)
{
wake_up_all(sk_sleep(sock->sk));
}
EXPORT_SYMBOL(libcfs_sock_abort_accept);
int int
libcfs_sock_connect (struct socket **sockp, int *fatal, libcfs_sock_connect (struct socket **sockp, int *fatal,
__u32 local_ip, int local_port, __u32 local_ip, int local_port,