diff options
author | Anand Avati <avati@redhat.com> | 2013-12-06 17:31:57 -0800 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-02-16 21:00:50 -0800 |
commit | dcd1db157479bf9f9ac3c39fd3fd8cb0359c0779 (patch) | |
tree | 2c9d46677a127021f0228556f0149f9b4f4f247d /libglusterfs/src/timer.h | |
parent | e424283c1f40386e5e3323b44df1a591ca62a7e8 (diff) |
timer: fix race between gf_timer_call_cancel() and gf_timer_proc()
>Change-Id: Ie264d3d591352e4a8ddaa90ae2174d9c552396f1
>BUG: 1243187
>Signed-off-by: Anand Avati <avati@redhat.com>
>Reviewed-on: http://review.gluster.org/6459
>Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
>Reviewed-by: Poornima G <pgurusid@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
>(cherry picked from commit ea90c92820ee0ca500345863cdfb5009d08b6ca7)
Change-Id: I2bc136e7d676826428afbf57f5afe50e2238fd33
BUG: 1246121
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/11796
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'libglusterfs/src/timer.h')
-rw-r--r-- | libglusterfs/src/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/timer.h index e64b350ec58..35d99be143c 100644 --- a/libglusterfs/src/timer.h +++ b/libglusterfs/src/timer.h @@ -29,12 +29,12 @@ struct _gf_timer { gf_timer_cbk_t callbk; void *data; xlator_t *xl; + gf_boolean_t fired; }; struct _gf_timer_registry { pthread_t th; char fin; - struct _gf_timer stale; struct _gf_timer active; pthread_mutex_t lock; }; |