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

Commit 933d36ba authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: set task state before scheduling in lnet_sock_accept 



In the original code change when libcfs_sock_accept() was made
into lnet_sock_accept() a call to set_current_state(TASK_INTERRUPTIBLE)
got dropped which was restored. For upstream this is an
optimization of calling init_waitqueue_entry() only if
accept() return -EAGAIN. Also we can remove setting the
task to TASK_RUNNING that is not needed.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6407
Reviewed-on: http://review.whamcloud.com/14265


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarAmir Shehata <amir.shehata@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 661489ad

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

+2 −4
Original line number Diff line number Diff line
@@ -531,8 +531,6 @@ lnet_sock_accept(struct socket **newsockp, struct socket *sock) 
	struct socket *newsock;

	int rc;



	init_waitqueue_entry(&wait, current);



	/*

	 * XXX this should add a ref to sock->ops->owner, if

	 * TCP could be a module
@@ -548,11 +546,11 @@ lnet_sock_accept(struct socket **newsockp, struct socket *sock) 
	rc = sock->ops->accept(sock, newsock, O_NONBLOCK);

	if (rc == -EAGAIN) {

		/* Nothing ready, so wait for activity */

		set_current_state(TASK_INTERRUPTIBLE);

		init_waitqueue_entry(&wait, current);

		add_wait_queue(sk_sleep(sock->sk), &wait);

		set_current_state(TASK_INTERRUPTIBLE);

		schedule();

		remove_wait_queue(sk_sleep(sock->sk), &wait);

		set_current_state(TASK_RUNNING);

		rc = sock->ops->accept(sock, newsock, O_NONBLOCK);

	}