Commit 223b7329 authored Feb 19, 2019 by Tung Nguyen Committed by David S. Miller Feb 21, 2019

tipc: improve function tipc_wait_for_cond()



Commit 844cf763 ("tipc: make macro tipc_wait_for_cond() smp safe")
replaced finish_wait() with remove_wait_queue() but still used
prepare_to_wait(). This causes unnecessary conditional
checking  before adding to wait queue in prepare_to_wait().

This commit replaces prepare_to_wait() with add_wait_queue()
as the pair function with remove_wait_queue().

Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3c963a33

net/tipc/socket.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ static int tipc_sk_sock_err(struct socket sock, long timeout)
		rc_ = tipc_sk_sock_err((sock_), timeo_); \
		if (rc_) \
		break; \
		prepare_to_wait(sk_sleep(sk_), &wait_, TASK_INTERRUPTIBLE); \
		add_wait_queue(sk_sleep(sk_), &wait_); \
		release_sock(sk_); \
		(timeo_) = wait_woken(&wait_, TASK_INTERRUPTIBLE, (timeo_)); \
		sched_annotate_sleep(); \

Admin message