diff options
| author | Amar Tumballi <amar@gluster.com> | 2010-08-24 00:42:39 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-08-24 02:35:40 -0700 |
| commit | cbdc4f6ba6f5e8e2ef0d40d9f6cf857dfd8b91df (patch) | |
| tree | 121fcd711d449483a727554e2d08721b5d9e507a | |
| parent | 80221e913e90d244c334edbbd51ad9bc05c0fca0 (diff) | |
fuse graph initialization related changes
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1406 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1406
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 5c43bf90206..c4452555c75 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3278,11 +3278,10 @@ notify (xlator_t *this, int32_t event, void *data, ...) case GF_EVENT_GRAPH_NEW: graph = data; - ret = fuse_graph_setup (this, graph); - if (ret) - break; - if (!private->fuse_thread_started) { + ret = fuse_graph_setup (this, graph); + if (ret) + break; private->fuse_thread_started = 1; ret = pthread_create (&private->fuse_thread, NULL, @@ -3303,6 +3302,10 @@ notify (xlator_t *this, int32_t event, void *data, ...) { /* set priv->active_subvol */ /* set priv->first_lookup = 1 */ + graph = data; + ret = fuse_graph_setup (this, graph); + if (ret) + break; pthread_mutex_lock (&private->sync_mutex); { @@ -3314,20 +3317,6 @@ notify (xlator_t *this, int32_t event, void *data, ...) break; } - case GF_EVENT_VOLFILE_MODIFIED: - { - gf_log (this->name, GF_LOG_CRITICAL, - "Remote volume file changed, try re-mounting."); - if (private->strict_volfile_check) { - //fuse_session_remove_chan (private->ch); - //fuse_session_destroy (private->se); - //fuse_unmount (private->mount_point, private->ch); - /* TODO: Above code if works, will be a cleaner way, - but for now, lets just achieve what we want */ - raise (SIGTERM); - } - break; - } default: break; } |