Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45bd3ebe authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging:lustre: remove useless libcfs_sock_abort_accept 



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: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e52fc91d

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ int libcfs_ipif_enumerate(char ***names); 
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_accept(struct socket **newsockp, struct socket *sock);

void libcfs_sock_abort_accept(struct socket *sock);

int libcfs_sock_connect(struct socket **sockp, int *fatal,

			__u32 local_ip, int local_port,

			__u32 peer_ip, int peer_port);

drivers/staging/lustre/lnet/lnet/acceptor.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ lnet_acceptor(void *arg) 
			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) {

			sock_release(newsock);

			break;
@@ -493,7 +493,7 @@ lnet_acceptor_stop(void) 
		return;



	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 */

	wait_for_completion(&lnet_acceptor_state.pta_signal);

drivers/staging/lustre/lnet/lnet/lib-socket.c

+0 −8
Original line number Diff line number Diff line
@@ -568,14 +568,6 @@ libcfs_sock_accept (struct socket **newsockp, struct socket *sock) 


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

libcfs_sock_connect (struct socket **sockp, int *fatal,

		     __u32 local_ip, int local_port,