Merge remote-tracking branch 'origin/release-3.8' into merge-3.8

Change-Id: Ie6c73dee0b6798af4a69c43c0b03c3d02ff36aa2

1 files changed, 4 insertions, 3 deletions

diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index eead33fbd55..525a6a6fbbc 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -4802,6 +4802,7 @@ fuse_graph_sync (xlator_t *this)
         fuse_private_t *priv                = NULL;
         int             need_first_lookup   = 0;
         int             ret                 = 0;
+        int             new_graph_id        = 0;
         xlator_t       *old_subvol          = NULL, *new_subvol = NULL;
         uint64_t        winds_on_old_subvol = 0;
 
@@ -4814,6 +4815,7 @@ fuse_graph_sync (xlator_t *this)
 
                 old_subvol = priv->active_subvol;
                 new_subvol = priv->active_subvol = priv->next_graph->top;
+                new_graph_id = priv->next_graph->id;
                 priv->next_graph = NULL;
                 need_first_lookup = 1;
 
@@ -4832,6 +4834,8 @@ unlock:
         pthread_mutex_unlock (&priv->sync_mutex);
 
         if (need_first_lookup) {
+                gf_log ("fuse", GF_LOG_INFO, "switched to graph %d",
+                        new_graph_id);
                 fuse_first_lookup (this);
         }
 
@@ -5237,9 +5241,6 @@ fuse_graph_setup (xlator_t *this, glusterfs_graph_t *graph)
                                prev_graph->top, NULL);
         }
 
-        gf_log ("fuse", GF_LOG_INFO, "switched to graph %d",
-                ((graph) ? graph->id : 0));
-
         return ret;
 unlock:
         pthread_mutex_unlock (&priv->sync_mutex);