From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, Oleg Drokin <oleg.drokin@intel.com>,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
lustre-devel@lists.lustre.org,
James Simmons <jsimmons@infradead.org>
Subject: [PATCH v4 3/7] staging:lustre: remove useless libcfs_sock_abort_accept
Date: Wed, 3 Jun 2015 15:57:09 -0400 [thread overview]
Message-ID: <1433361433-24976-4-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1433361433-24976-1-git-send-email-jsimmons@infradead.org>
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>
---
.../staging/lustre/include/linux/libcfs/libcfs.h | 1 -
drivers/staging/lustre/lnet/lnet/acceptor.c | 4 ++--
drivers/staging/lustre/lnet/lnet/lib-socket.c | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index f469333..457ce9a 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -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);
diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c
index bc212f5..5187e65 100644
--- a/drivers/staging/lustre/lnet/lnet/acceptor.c
+++ b/drivers/staging/lustre/lnet/lnet/acceptor.c
@@ -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);
diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c
index 259db61..bb8d9c2 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-socket.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c
@@ -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,
--
1.7.1
next prev parent reply other threads:[~2015-06-03 19:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 19:57 [PATCH v4 0/7] staging:lustre: remove tcpip abstraction from libcfs James Simmons
2015-06-03 19:57 ` [PATCH v4 1/7] staging:lustre: move tcpip abstraction James Simmons
2015-06-04 5:35 ` Sudip Mukherjee
2015-06-04 7:34 ` Dan Carpenter
2015-06-04 7:45 ` Sudip Mukherjee
2015-06-09 13:38 ` [lustre-devel] " Simmons, James A.
2015-06-08 19:33 ` Greg Kroah-Hartman
2015-06-08 19:57 ` Joe Perches
2015-06-03 19:57 ` [PATCH v4 2/7] staging:lustre: remove useless libcfs_sock_release James Simmons
2015-06-03 19:57 ` James Simmons [this message]
2015-06-03 19:57 ` [PATCH v4 4/7] staging:lustre: rename tcpip handling functions to lnet_* prefix James Simmons
2015-06-04 5:57 ` Sudip Mukherjee
2015-06-04 7:41 ` Dan Carpenter
2015-06-03 19:57 ` [PATCH v4 5/7] staging:lustre: use available kernel wrappers in lib-socket.c James Simmons
2015-06-03 19:57 ` [PATCH v4 6/7] staging:lustre: style cleanups for lib-socket.c James Simmons
2015-06-04 6:02 ` Sudip Mukherjee
2015-06-04 7:54 ` Dan Carpenter
2015-06-03 19:57 ` [PATCH v4 7/7] staging:lustre: Update license and copyright " James Simmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433361433-24976-4-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).