summaryrefslogtreecommitdiffstats
path: root/xlators/mount/fuse
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2011-06-30 03:18:58 +0000
committerAnand Avati <avati@gluster.com>2011-07-01 01:27:18 -0700
commit5a12de49915c2a7d5aec783c389c7a5cc0be8a1f (patch)
tree69ec1f5b50b7e206c43a721d91b5e9f505866701 /xlators/mount/fuse
parent89d35b73a3ac07d2708cfb86af371e38c2c76509 (diff)
mount/fuse: wait till CHILD_UP event is recieved to do the first lookup.
Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 3091 (rebalance fails with "transport endpoint not connected" in 3.2.1 rdma set-up) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3091
Diffstat (limited to 'xlators/mount/fuse')
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 6eea75b64d6..9f273a3968a 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -3026,8 +3026,6 @@ fuse_graph_sync (xlator_t *this)
{
fuse_private_t *priv = NULL;
int need_first_lookup = 0;
- struct timeval now = {0, };
- struct timespec timeout = {0, };
int ret = 0;
priv = this->private;
@@ -3041,14 +3039,9 @@ fuse_graph_sync (xlator_t *this)
priv->next_graph = NULL;
need_first_lookup = 1;
- gettimeofday (&now, NULL);
- timeout.tv_sec = now.tv_sec + MAX_FUSE_PROC_DELAY;
- timeout.tv_nsec = now.tv_usec * 1000;
-
while (!priv->child_up) {
- ret = pthread_cond_timedwait (&priv->sync_cond,
- &priv->sync_mutex,
- &timeout);
+ ret = pthread_cond_wait (&priv->sync_cond,
+ &priv->sync_mutex);
if (ret != 0) {
gf_log (this->name, GF_LOG_DEBUG,
"timedwait returned non zero value "