1 files changed, 50 insertions, 38 deletions

diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index d8997bc7d..a277c58a8 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -79,6 +79,9 @@ fill_defaults (xlator_t *xl)
         SET_DEFAULT_FOP (fxattrop);
         SET_DEFAULT_FOP (setattr);
         SET_DEFAULT_FOP (fsetattr);
+	SET_DEFAULT_FOP (fallocate);
+	SET_DEFAULT_FOP (discard);
+        SET_DEFAULT_FOP (zerofill);
 
         SET_DEFAULT_FOP (getspec);
 
@@ -359,29 +362,6 @@ out:
         return search;
 }
 
-xlator_t *
-xlator_search_by_xl_type (xlator_t *any, const char *type)
-{
-        xlator_t *search = NULL;
-
-        GF_VALIDATE_OR_GOTO ("xlator", any, out);
-        GF_VALIDATE_OR_GOTO ("xlator", type, out);
-
-        search = any;
-
-        while (search->prev)
-                search = search->prev;
-
-        while (search) {
-                if (!strcmp (search->type, type))
-                        break;
-                search = search->next;
-        }
-
-out:
-        return search;
-}
-
 static int
 __xlator_init(xlator_t *xl)
 {
@@ -536,10 +516,26 @@ out:
         return;
 }
 
+int
+xlator_list_destroy (xlator_list_t *list)
+{
+        xlator_list_t *next = NULL;
+
+        while (list) {
+                next = list->next;
+                GF_FREE (list);
+                list = next;
+        }
+
+        return 0;
+}
+
 
 int
 xlator_tree_free (xlator_t *tree)
 {
+        volume_opt_list_t *vol_opt = NULL;
+        volume_opt_list_t *tmp     = NULL;
         xlator_t *trav = tree;
         xlator_t *prev = tree;
 
@@ -550,9 +546,19 @@ xlator_tree_free (xlator_t *tree)
 
         while (prev) {
                 trav = prev->next;
-                dict_destroy (prev->options);
+                if (prev->dlhandle)
+                        dlclose (prev->dlhandle);
+                dict_unref (prev->options);
                 GF_FREE (prev->name);
                 GF_FREE (prev->type);
+                xlator_list_destroy (prev->children);
+                xlator_list_destroy (prev->parents);
+
+                list_for_each_entry_safe (vol_opt, tmp, &prev->volume_options,
+                                          list) {
+                        list_del_init (&vol_opt->list);
+                        GF_FREE (vol_opt);
+                }
                 GF_FREE (prev);
                 prev = trav;
         }
@@ -618,10 +624,12 @@ out:
         return ret;
 }
 
-char*
-loc_gfid_utoa (loc_t *loc)
+void
+loc_gfid (loc_t *loc, uuid_t gfid)
 {
-        uuid_t  gfid={0};
+        if (!gfid)
+                goto out;
+        uuid_clear (gfid);
 
         if (!loc)
                 goto out;
@@ -630,6 +638,14 @@ loc_gfid_utoa (loc_t *loc)
         else if (loc->inode && (!uuid_is_null (loc->inode->gfid)))
                 uuid_copy (gfid, loc->inode->gfid);
 out:
+        return;
+}
+
+char*
+loc_gfid_utoa (loc_t *loc)
+{
+        uuid_t gfid;
+        loc_gfid (loc, gfid);
         return uuid_utoa (gfid);
 }
 
@@ -672,21 +688,17 @@ err:
         return ret;
 }
 
-int
-xlator_list_destroy (xlator_list_t *list)
+gf_boolean_t
+loc_is_root (loc_t *loc)
 {
-        xlator_list_t *next = NULL;
-
-        while (list) {
-                next = list->next;
-                GF_FREE (list);
-                list = next;
+        if (loc && __is_root_gfid (loc->gfid)) {
+                return _gf_true;
+        } else if (loc && loc->inode && __is_root_gfid (loc->inode->gfid)) {
+                return _gf_true;
         }
-
-        return 0;
+        return _gf_false;
 }
 
-
 int
 xlator_destroy (xlator_t *xl)
 {