1 files changed, 26 insertions, 31 deletions

diff --git a/libglusterfs/src/syncop-utils.c b/libglusterfs/src/syncop-utils.c
index d2a71698745..d9f1723856d 100644
--- a/libglusterfs/src/syncop-utils.c
+++ b/libglusterfs/src/syncop-utils.c
@@ -8,10 +8,10 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "syncop.h"
-#include "syncop-utils.h"
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/syncop.h"
+#include "glusterfs/syncop-utils.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 struct syncop_dir_scan_data {
     xlator_t *subvol;
@@ -345,11 +345,16 @@ syncop_mt_dir_scan(call_frame_t *frame, xlator_t *subvol, loc_t *loc, int pid,
     gf_dirent_t *tmp = NULL;
     uint32_t jobs_running = 0;
     uint32_t qlen = 0;
-    pthread_cond_t cond;
-    pthread_mutex_t mut;
-    gf_boolean_t cond_init = _gf_false;
-    gf_boolean_t mut_init = _gf_false;
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+    pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
     gf_dirent_t entries;
+    xlator_t *this = NULL;
+
+    if (frame) {
+        this = frame->this;
+    } else {
+        this = THIS;
+    }
 
     /*For this functionality to be implemented in general, we need
      * synccond_t infra which doesn't block the executing thread. Until then
@@ -371,15 +376,6 @@ syncop_mt_dir_scan(call_frame_t *frame, xlator_t *subvol, loc_t *loc, int pid,
 
     INIT_LIST_HEAD(&entries.list);
     INIT_LIST_HEAD(&q.list);
-    ret = pthread_mutex_init(&mut, NULL);
-    if (ret)
-        goto out;
-    mut_init = _gf_true;
-
-    ret = pthread_cond_init(&cond, NULL);
-    if (ret)
-        goto out;
-    cond_init = _gf_true;
 
     while ((ret = syncop_readdir(subvol, fd, 131072, offset, &entries, xdata,
                                  NULL))) {
@@ -397,13 +393,16 @@ syncop_mt_dir_scan(call_frame_t *frame, xlator_t *subvol, loc_t *loc, int pid,
 
         list_for_each_entry_safe(entry, tmp, &entries.list, list)
         {
+            if (this && this->cleanup_starting)
+                goto out;
+
             list_del_init(&entry->list);
             if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
                 gf_dirent_entry_free(entry);
                 continue;
             }
 
-            if (entry->d_type == IA_IFDIR) {
+            if (entry->d_stat.ia_type == IA_IFDIR) {
                 ret = fn(subvol, entry, loc, data);
                 gf_dirent_entry_free(entry);
                 if (ret)
@@ -442,21 +441,17 @@ syncop_mt_dir_scan(call_frame_t *frame, xlator_t *subvol, loc_t *loc, int pid,
 out:
     if (fd)
         fd_unref(fd);
-    if (mut_init && cond_init) {
-        pthread_mutex_lock(&mut);
-        {
-            while (jobs_running)
-                pthread_cond_wait(&cond, &mut);
-        }
-        pthread_mutex_unlock(&mut);
-        gf_dirent_free(&q);
-        gf_dirent_free(&entries);
+
+    pthread_mutex_lock(&mut);
+    {
+        while (jobs_running)
+            pthread_cond_wait(&cond, &mut);
     }
+    pthread_mutex_unlock(&mut);
+
+    gf_dirent_free(&q);
+    gf_dirent_free(&entries);
 
-    if (mut_init)
-        pthread_mutex_destroy(&mut);
-    if (cond_init)
-        pthread_cond_destroy(&cond);
     return ret | retval;
 }