diff options
| author | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-12 16:39:04 +0100 |
| commit | 080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch) | |
| tree | 4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /src/kernel/dnbd3.h | |
| parent | [SERVER] Fix embarrassing deadlock when deleting old images (diff) | |
| parent | tiny fix (diff) | |
| download | dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip | |
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts:
src/server/altservers.c
Diffstat (limited to 'src/kernel/dnbd3.h')
| -rw-r--r-- | src/kernel/dnbd3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h index aa9ea86..c703019 100644 --- a/src/kernel/dnbd3.h +++ b/src/kernel/dnbd3.h @@ -68,8 +68,8 @@ typedef struct struct socket *better_sock; // process - struct task_struct *thread_send; - struct task_struct *thread_receive; + struct task_struct * volatile thread_send; + struct task_struct * volatile thread_receive; struct task_struct *thread_discover; struct timer_list hb_timer; wait_queue_head_t process_queue_send; |