summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/timer.h
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2013-12-06 17:31:57 -0800
committerPranith Kumar Karampuri <pkarampu@redhat.com>2015-07-29 04:17:25 -0700
commitea90c92820ee0ca500345863cdfb5009d08b6ca7 (patch)
treeb0b0d3821a456e8c36914a4eed67348a207ec8c8 /libglusterfs/src/timer.h
parentf7e898cb33b7702ef7299c73f63d70163144b148 (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>
Diffstat (limited to 'libglusterfs/src/timer.h')
-rw-r--r--libglusterfs/src/timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libglusterfs/src/timer.h b/libglusterfs/src/timer.h
index 220a280c705..fff902814ed 100644
--- a/libglusterfs/src/timer.h
+++ b/libglusterfs/src/timer.h
@@ -24,12 +24,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;
};