lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "neuron: block_client: Fix init loop"

Browse Source
This commit is contained in:
qctecmdr 2020-04-22 12:03:58 -07:00 committed by Gerrit - the friendly Code Review server
commit 304f2f125b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/neuron/protocol/prot_block_client.c
View File

@ -178,8 +178,8 @@ static int protocol_block_client_thread(void *data)
skb_req = NULL; skb_req = NULL;
/* Wait for the channels to start */ /* Wait for the channels to start */
wakeup_mask = 0;
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
wakeup_mask = 0;
if (!channel_dev->max_size || !channel_dev->queue_length) if (!channel_dev->max_size || !channel_dev->queue_length)
wakeup_mask |= CHANNEL_BIT(C_IN); wakeup_mask |= CHANNEL_BIT(C_IN);
@ -192,10 +192,6 @@ static int protocol_block_client_thread(void *data)
wait_event_killable(kdata->wait_q, wait_event_killable(kdata->wait_q,
kthread_should_stop() || kthread_should_stop() ||
(kdata->wakeups & wakeup_mask)); (kdata->wakeups & wakeup_mask));
wakeup_mask &= ~xchg(&kdata->wakeups, 0);
/* flush shared variable to memory */
smp_mb__after_atomic();
} }
if (kthread_should_stop()) if (kthread_should_stop())
return 0; return 0;