From fa25e79a00ef314a7a972534d4cd9e3b6f7fa6c4 Mon Sep 17 00:00:00 2001

From: Sakshi <sabansal@redhat.com>

Date: Mon, 31 Aug 2015 16:06:35 +0530

Subject: [PATCH 320/320] dht : lock on all subvols to prevent rmdir vs lookup selfheal race

Reverting the changes made for fixing the above problem

Change-Id: I31baf2b2fa2f62c57429cd44f3f229c35eff1939

BUG: 1115367

Signed-off-by: Sakshi <sabansal@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/56702

Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>

Tested-by: Raghavendra Gowdappa <rgowdapp@redhat.com>

---

 xlators/cluster/dht/src/dht-common.c   |  180 ++++---------------------------

 xlators/cluster/dht/src/dht-common.h   |   14 +--

 xlators/cluster/dht/src/dht-helper.c   |   38 +------

 xlators/cluster/dht/src/dht-rename.c   |    2 +-

 xlators/cluster/dht/src/dht-selfheal.c |  183 +++++++++----------------------

 5 files changed, 86 insertions(+), 331 deletions(-)

diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c

index f819aa6..5c1a693 100644

--- a/xlators/cluster/dht/src/dht-common.c

+++ b/xlators/cluster/dht/src/dht-common.c

@@ -40,10 +40,6 @@ dht_setxattr2 (xlator_t *this, xlator_t *subvol, call_frame_t *frame);

 int run_defrag = 0;

 int

-dht_rmdir_unlock (call_frame_t *frame, xlator_t *this);

-

-

-int

 dht_aggregate_quota_xattr (dict_t *dst, char *key, data_t *value)

 {

         int              ret            = -1;

@@ -4518,6 +4514,7 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,

                  * corresponding hashed subvolume will take care of the

                  * directory entry.

                  */

+

                         if (readdir_optimize) {

                                 if (prev->this == local->first_up_subvol)

                                         goto list;

@@ -5002,7 +4999,7 @@ out:

         if (local && local->lock.locks) {

                 /* store op_errno for failure case*/

                 local->op_errno = op_errno;

-                local->refresh_layout_unlock (frame, this, op_ret, 0);

+                local->refresh_layout_unlock (frame, this, op_ret);

                 if (op_ret == 0) {

                         DHT_STACK_UNWIND (mknod, frame, op_ret, op_errno,

@@ -5047,7 +5044,7 @@ dht_mknod_linkfile_create_cbk (call_frame_t *frame, void *cookie,

         return 0;

 err:

         if (local->lock.locks)

-                local->refresh_layout_unlock (frame, this, -1, 0);

+                local->refresh_layout_unlock (frame, this, -1);

         return 0;

 }

@@ -5152,7 +5149,7 @@ dht_mknod_do (call_frame_t *frame)

                                          local->umask, local->params);

         return 0;

 err:

-        local->refresh_layout_unlock (frame, this, -1, 0);

+        local->refresh_layout_unlock (frame, this, -1);

         return 0;

 }

@@ -5167,7 +5164,7 @@ dht_mknod_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

 }

 int32_t

-dht_mknod_finish (call_frame_t *frame, xlator_t *this, int op_ret, int invoke_cbk)

+dht_mknod_finish (call_frame_t *frame, xlator_t *this, int op_ret)

 {

         dht_local_t  *local      = NULL, *lock_local = NULL;

         call_frame_t *lock_frame = NULL;

@@ -5242,7 +5239,7 @@ dht_mknod_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         return 0;

 err:

-        dht_mknod_finish (frame, this, -1, 0);

+        dht_mknod_finish (frame, this, -1);

         return 0;

 }

@@ -5273,7 +5270,7 @@ dht_mknod_lock (call_frame_t *frame, xlator_t *subvol)

         local->lock.lk_count = count;

         ret = dht_blocking_inodelk (frame, lk_array, count,

-                                    IGNORE_ENOENT_ESTALE, dht_mknod_lock_cbk);

+                                    dht_mknod_lock_cbk);

         if (ret < 0) {

                 local->lock.locks = NULL;

@@ -5800,7 +5797,7 @@ out:

         if (local && local->lock.locks) {

                 /* store op_errno for failure case*/

                 local->op_errno = op_errno;

-                local->refresh_layout_unlock (frame, this, op_ret, 0);

+                local->refresh_layout_unlock (frame, this, op_ret);

                 if (op_ret == 0) {

                         DHT_STACK_UNWIND (create, frame, op_ret, op_errno, fd,

@@ -5841,7 +5838,7 @@ dht_create_linkfile_create_cbk (call_frame_t *frame, void *cookie,

         return 0;

 err:

         if (local->lock.locks)

-                local->refresh_layout_unlock (frame, this, -1, 0);

+                local->refresh_layout_unlock (frame, this, -1);

         return 0;

 }

@@ -6005,7 +6002,7 @@ dht_create_do (call_frame_t *frame)

                                          local->umask, local->fd, local->params);

         return 0;

 err:

-        local->refresh_layout_unlock (frame, this, -1, 0);

+        local->refresh_layout_unlock (frame, this, -1);

         return 0;

 }

@@ -6019,7 +6016,7 @@ dht_create_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

 }

 int32_t

-dht_create_finish (call_frame_t *frame, xlator_t *this, int op_ret, int invoke_cbk)

+dht_create_finish (call_frame_t *frame, xlator_t *this, int op_ret)

 {

         dht_local_t  *local      = NULL, *lock_local = NULL;

         call_frame_t *lock_frame = NULL;

@@ -6094,7 +6091,7 @@ dht_create_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         return 0;

 err:

-        dht_create_finish (frame, this, -1, 0);

+        dht_create_finish (frame, this, -1);

         return 0;

 }

@@ -6125,7 +6122,7 @@ dht_create_lock (call_frame_t *frame, xlator_t *subvol)

         local->lock.lk_count = count;

         ret = dht_blocking_inodelk (frame, lk_array, count,

-                                    IGNORE_ENOENT_ESTALE, dht_create_lock_cbk);

+                                    dht_create_lock_cbk);

         if (ret < 0) {

                 local->lock.locks = NULL;

@@ -6585,7 +6582,6 @@ unlock:

         this_call_cnt = dht_frame_return (frame);

         if (is_last_call (this_call_cnt)) {

                if (local->need_selfheal) {

-                        dht_rmdir_unlock (frame, this);

                         local->layout =

                                 dht_layout_get (this, local->loc.inode);

@@ -6609,7 +6605,6 @@ unlock:

                                                            1);

                         }

-                        dht_rmdir_unlock (frame, this);

                         DHT_STACK_UNWIND (rmdir, frame, local->op_ret,

                                           local->op_errno, &local->preparent,

                                           &local->postparent, NULL);

@@ -6678,7 +6673,6 @@ unlock:

         if (done) {

                 if (local->need_selfheal && local->fop_succeeded) {

-                        dht_rmdir_unlock (frame, this);

                         local->layout =

                                 dht_layout_get (this, local->loc.inode);

@@ -6713,7 +6707,6 @@ unlock:

                         }

-                        dht_rmdir_unlock (frame, this);

                         DHT_STACK_UNWIND (rmdir, frame, local->op_ret,

                                           local->op_errno, &local->preparent,

                                           &local->postparent, NULL);

@@ -6725,110 +6718,11 @@ unlock:

 int

-dht_rmdir_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

-                      int32_t op_ret, int32_t op_errno, dict_t *xdata)

-{

-        DHT_STACK_DESTROY (frame);

-        return 0;

-}

-

-

-int

-dht_rmdir_unlock (call_frame_t *frame, xlator_t *this)

-{

-        dht_local_t  *local      = NULL, *lock_local = NULL;

-        call_frame_t *lock_frame = NULL;

-        int           lock_count = 0;

-

-        local = frame->local;

-        lock_count = dht_lock_count (local->lock.locks, local->lock.lk_count);

-

-        if (lock_count == 0)

-                goto done;

-

-        lock_frame = copy_frame (frame);

-        if (lock_frame == NULL)

-                goto done;

-

-        lock_local = dht_local_init (lock_frame, &local->loc, NULL,

-                                     lock_frame->root->op);

-        if (lock_local == NULL)

-                goto done;

-

-        lock_local->lock.locks = local->lock.locks;

-        lock_local->lock.lk_count = local->lock.lk_count;

-

-        local->lock.locks = NULL;

-        local->lock.lk_count = 0;

-        dht_unlock_inodelk (lock_frame, lock_local->lock.locks,

-                            lock_local->lock.lk_count,

-                            dht_rmdir_unlock_cbk);

-        lock_frame = NULL;

-

-done:

-        if (lock_frame != NULL) {

-                DHT_STACK_DESTROY (lock_frame);

-        }

-

-        return 0;

-}

-

-

-int

-dht_rmdir_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

-                    int32_t op_ret, int32_t op_errno, dict_t *xdata)

-{

-        dht_local_t  *local = NULL;

-        dht_conf_t   *conf  = NULL;

-        int           i     = 0;

-

-        VALIDATE_OR_GOTO (this->private, err);

-

-        conf = this->private;

-        local = frame->local;

-

-        if (op_ret < 0) {

-                gf_msg (this->name, GF_LOG_WARNING, op_errno,

-                        DHT_MSG_INODE_LK_ERROR,

-                        "acquiring inodelk failed rmdir for %s)",

-                        local->loc.path);

-

-                local->op_ret = -1;

-                local->op_errno = (op_errno == EAGAIN) ? EBUSY : op_errno;

-                goto err;

-        }

-

-        for (i = 0; i < conf->subvolume_cnt; i++) {

-                if (local->hashed_subvol &&

-                    (local->hashed_subvol == conf->subvolumes[i]))

-                        continue;

-

-                STACK_WIND (frame, dht_rmdir_cbk,

-                            conf->subvolumes[i],

-                            conf->subvolumes[i]->fops->rmdir,

-                            &local->loc, local->flags, NULL);

-        }

-

-        return 0;

-

-err:

-        /* No harm in calling an extra rmdir unlock */

-        dht_rmdir_unlock (frame, this);

-        DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,

-                          &local->preparent, &local->postparent, NULL);

-

-        return 0;

-}

-

-

-int

 dht_rmdir_do (call_frame_t *frame, xlator_t *this)

 {

         dht_local_t  *local = NULL;

         dht_conf_t   *conf = NULL;

-        dht_lock_t   **lk_array = NULL;

-        int           i = 0, ret = -1;

-        int           count = 1;

+        int           i = 0;

         xlator_t     *hashed_subvol = NULL;

         char gfid[GF_UUID_BUF_SIZE] ={0};

@@ -6842,6 +6736,7 @@ dht_rmdir_do (call_frame_t *frame, xlator_t *this)

         local->call_cnt = conf->subvolume_cnt;

+

         /* first remove from non-hashed_subvol */

         hashed_subvol = dht_subvol_get_hashed (this, &local->loc);

@@ -6865,49 +6760,20 @@ dht_rmdir_do (call_frame_t *frame, xlator_t *this)

                 return 0;

         }

-        count = conf->subvolume_cnt;

-

-        lk_array = GF_CALLOC (count, sizeof (*lk_array), gf_common_mt_char);

-        if (lk_array == NULL) {

-                local->op_ret = -1;

-                local->op_errno = ENOMEM;

-                goto err;

-        }

-

-        for (i = 0; i < count; i++) {

-                lk_array[i] = dht_lock_new (frame->this,

-                                            conf->subvolumes[i],

-                                            &local->loc, F_WRLCK,

-                                            DHT_LAYOUT_HEAL_DOMAIN);

-                if (lk_array[i] == NULL) {

-                        local->op_ret = -1;

-                        local->op_errno = EINVAL;

-                        goto err;

-                }

-        }

-

-        local->lock.locks = lk_array;

-        local->lock.lk_count = count;

+        for (i = 0; i < conf->subvolume_cnt; i++) {

+                if (hashed_subvol &&

+                    (hashed_subvol == conf->subvolumes[i]))

+                        continue;

-        ret = dht_blocking_inodelk (frame, lk_array, count,

-                                    IGNORE_ENOENT_ESTALE,

-                                    dht_rmdir_lock_cbk);

-        if (ret < 0) {

-                local->lock.locks = NULL;

-                local->lock.lk_count = 0;

-                local->op_ret = -1;

-                local->op_errno = errno ? errno : EINVAL;

-                goto err;

+                STACK_WIND (frame, dht_rmdir_cbk,

+                            conf->subvolumes[i],

+                            conf->subvolumes[i]->fops->rmdir,

+                            &local->loc, local->flags, NULL);

         }

         return 0;

 err:

-        if (lk_array != NULL) {

-                dht_lock_array_free (lk_array, count);

-                GF_FREE (lk_array);

-        }

-

         DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,

                           &local->preparent, &local->postparent, NULL);

         return 0;

diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h

index 7f99a06..1b5a084 100644

--- a/xlators/cluster/dht/src/dht-common.h

+++ b/xlators/cluster/dht/src/dht-common.h

@@ -45,7 +45,7 @@ typedef int (*dht_defrag_cbk_fn_t) (xlator_t        *this, xlator_t *dst_node,

                                     call_frame_t    *frame);

 typedef int (*dht_refresh_layout_unlock) (call_frame_t *frame, xlator_t *this,

-                                         int op_ret, int invoke_cbk);

+                                         int op_ret);

 typedef int (*dht_refresh_layout_done_handle) (call_frame_t *frame);

@@ -136,11 +136,6 @@ typedef enum {

         qdstatfs_action_COMPARE,

 } qdstatfs_action_t;

-typedef enum {

-        FAIL_ON_ANY_ERROR,

-        IGNORE_ENOENT_ESTALE

-} dht_reaction_type_t;

-

 struct dht_skip_linkto_unlink {

         gf_boolean_t    handle_valid_link;

@@ -271,7 +266,6 @@ struct dht_local {

                 fop_inodelk_cbk_t   inodelk_cbk;

                 dht_lock_t        **locks;

                 int                 lk_count;

-                dht_reaction_type_t reaction;

                 /* whether locking failed on _any_ of the "locks" above */

                 int                 op_ret;

@@ -1053,8 +1047,7 @@ dht_fill_dict_to_avoid_unlink_of_migrating_file (dict_t *dict);

 int

 dht_nonblocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

-                         int lk_count, dht_reaction_type_t reaction,

-                         fop_inodelk_cbk_t inodelk_cbk);

+                         int lk_count, fop_inodelk_cbk_t inodelk_cbk);

 /* same as dht_nonblocking_inodelk, but issues sequential blocking locks on

  * @lk_array directly. locks are issued on some order which remains same

@@ -1062,8 +1055,7 @@ dht_nonblocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

  */

 int

 dht_blocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

-                      int lk_count, dht_reaction_type_t reaction,

-                      fop_inodelk_cbk_t inodelk_cbk);

+                      int lk_count, fop_inodelk_cbk_t inodelk_cbk);

 int32_t

 dht_unlock_inodelk (call_frame_t *frame, dht_lock_t **lk_array, int lk_count,

diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c

index 1b3fbb0..2e4a53c 100644

--- a/xlators/cluster/dht/src/dht-helper.c

+++ b/xlators/cluster/dht/src/dht-helper.c

@@ -347,7 +347,6 @@ dht_lock_new (xlator_t *this, xlator_t *xl, loc_t *loc, short type,

         lock->xl = xl;

         lock->type = type;

-

         lock->domain = gf_strdup (domain);

         if (lock->domain == NULL) {

                 dht_lock_free (lock);

@@ -1693,8 +1692,7 @@ out:

 int

 dht_nonblocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

-                         int lk_count, dht_reaction_type_t reaction,

-                         fop_inodelk_cbk_t inodelk_cbk)

+                         int lk_count, fop_inodelk_cbk_t inodelk_cbk)

 {

         struct gf_flock  flock      = {0,};

         int              i          = 0, ret = 0;

@@ -1717,7 +1715,6 @@ dht_nonblocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

         dht_set_lkowner (lk_array, lk_count, &lock_frame->root->lk_owner);

         local = lock_frame->local;

-        local->lock.reaction = reaction;

         local->main_frame = frame;

         local->call_cnt = lk_count;

@@ -1748,42 +1745,21 @@ dht_blocking_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

                           int32_t op_ret, int32_t op_errno, dict_t *xdata)

 {

         int          lk_index = 0;

-        int          i        = 0;

         dht_local_t *local    = NULL;

         lk_index = (long) cookie;

         local = frame->local;

+

         if (op_ret == 0) {

                 local->lock.locks[lk_index]->locked = _gf_true;

         } else {

-                switch (op_errno) {

-                case ESTALE:

-                case ENOENT:

-                        if (local->lock.reaction != IGNORE_ENOENT_ESTALE) {

-                                local->lock.op_ret = -1;

-                                local->lock.op_errno = op_errno;

-                                goto cleanup;

-                        }

-                        break;

-                default:

-                        local->lock.op_ret = -1;

-                        local->lock.op_errno = op_errno;

-                        goto cleanup;

-                }

+                local->lock.op_ret = -1;

+                local->lock.op_errno = op_errno;

+                goto cleanup;

         }

         if (lk_index == (local->lock.lk_count - 1)) {

-                for (i = 0; (i < local->lock.lk_count) &&

-                     (!local->lock.locks[i]->locked); i++) {

-                        ;

-                }

-

-                if (i == local->lock.lk_count) {

-                        local->lock.op_ret = -1;

-                        local->lock.op_errno = op_errno;

-                }

-

                 dht_inodelk_done (frame);

         } else {

                 dht_blocking_inodelk_rec (frame, ++lk_index);

@@ -1857,8 +1833,7 @@ out:

 int

 dht_blocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

-                      int lk_count, dht_reaction_type_t reaction,

-                      fop_inodelk_cbk_t inodelk_cbk)

+                      int lk_count, fop_inodelk_cbk_t inodelk_cbk)

 {

         int           ret        = -1;

         call_frame_t *lock_frame = NULL;

@@ -1880,7 +1855,6 @@ dht_blocking_inodelk (call_frame_t *frame, dht_lock_t **lk_array,

         dht_set_lkowner (lk_array, lk_count, &lock_frame->root->lk_owner);

         local = lock_frame->local;

-        local->lock.reaction = reaction;

         local->main_frame = frame;

         dht_blocking_inodelk_rec (lock_frame, 0);

diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c

index 06d7ac8..320f875 100644

--- a/xlators/cluster/dht/src/dht-rename.c

+++ b/xlators/cluster/dht/src/dht-rename.c

@@ -1307,7 +1307,7 @@ dht_rename_lock (call_frame_t *frame)

         local->lock.lk_count = count;

         ret = dht_nonblocking_inodelk (frame, lk_array, count,

-                                       FAIL_ON_ANY_ERROR, dht_rename_lock_cbk);

+                                       dht_rename_lock_cbk);

         if (ret < 0) {

                 local->lock.locks = NULL;

                 local->lock.lk_count = 0;

diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c

index 46491cf..b9b58ea 100644

--- a/xlators/cluster/dht/src/dht-selfheal.c

+++ b/xlators/cluster/dht/src/dht-selfheal.c

@@ -82,7 +82,7 @@ dht_selfheal_unlock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

 }

 int

-dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret, int invoke_cbk)

+dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret)

 {

         dht_local_t  *local      = NULL, *lock_local = NULL;

         call_frame_t *lock_frame = NULL;

@@ -90,6 +90,7 @@ dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret, int invok

         local = frame->local;

         lock_count = dht_lock_count (local->lock.locks, local->lock.lk_count);

+

         if (lock_count == 0)

                 goto done;

@@ -116,9 +117,8 @@ dht_selfheal_dir_finish (call_frame_t *frame, xlator_t *this, int ret, int invok

         lock_frame = NULL;

 done:

-        if (!invoke_cbk)

-                local->selfheal.dir_cbk (frame, NULL, frame->this, ret,

-                                         local->op_errno, NULL);

+        local->selfheal.dir_cbk (frame, NULL, frame->this, ret,

+                                 local->op_errno, NULL);

         if (lock_frame != NULL) {

                 DHT_STACK_DESTROY (lock_frame);

         }

@@ -160,13 +160,13 @@ dht_refresh_layout_done (call_frame_t *frame)

                 dht_layout_unref (frame->this, heal);

-                dht_selfheal_dir_finish (frame, frame->this, 0, 0);

+                dht_selfheal_dir_finish (frame, frame->this, 0);

         }

         return 0;

 err:

-        dht_selfheal_dir_finish (frame, frame->this, -1, 0);

+        dht_selfheal_dir_finish (frame, frame->this, -1);

         return 0;

 }

@@ -224,9 +224,9 @@ unlock:

         return 0;

 err:

-        local->refresh_layout_unlock (frame, this, -1, 0);

+        local->refresh_layout_unlock (frame, this, -1);

-        dht_selfheal_dir_finish (frame, this, -1, 0);

+        dht_selfheal_dir_finish (frame, this, -1);

         return 0;

 }

@@ -292,8 +292,8 @@ dht_refresh_layout (call_frame_t *frame)

         return 0;

 out:

-        local->refresh_layout_unlock (frame, this, -1, 0);

-        dht_selfheal_dir_finish (frame, this, -1, 0);

+        local->refresh_layout_unlock (frame, this, -1);

+        dht_selfheal_dir_finish (frame, this, -1);

         return 0;

 }

@@ -321,7 +321,7 @@ dht_selfheal_layout_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         return 0;

 err:

-        dht_selfheal_dir_finish (frame, this, -1, 0);

+        dht_selfheal_dir_finish (frame, this, -1);

         return 0;

 }

@@ -582,7 +582,7 @@ dht_selfheal_layout_lock (call_frame_t *frame, dht_layout_t *layout,

         local->lock.locks = lk_array;

         local->lock.lk_count = count;

-        ret = dht_blocking_inodelk (frame, lk_array, count, FAIL_ON_ANY_ERROR,

+        ret = dht_blocking_inodelk (frame, lk_array, count,

                                     dht_selfheal_layout_lock_cbk);

         if (ret < 0) {

                 local->lock.locks = NULL;

@@ -593,7 +593,13 @@ dht_selfheal_layout_lock (call_frame_t *frame, dht_layout_t *layout,

         return 0;

 err:

         if (lk_array != NULL) {

-                dht_lock_array_free (lk_array, count);

+                int tmp_count = 0, i = 0;

+

+                for (i = 0; (i < count) && (lk_array[i]); i++, tmp_count++) {

+                        ;

+                }

+

+                dht_lock_array_free (lk_array, tmp_count);

                 GF_FREE (lk_array);

         }

@@ -632,7 +638,7 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         this_call_cnt = dht_frame_return (frame);

         if (is_last_call (this_call_cnt)) {

-                dht_selfheal_dir_finish (frame, this, 0, 0);

+                dht_selfheal_dir_finish (frame, this, 0);

         }

         return 0;

@@ -827,7 +833,7 @@ dht_selfheal_dir_xattr (call_frame_t *frame, loc_t *loc, dht_layout_t *layout)

                       missing_xattr, loc->path);

         if (missing_xattr == 0) {

-                dht_selfheal_dir_finish (frame, this, 0, 0);

+                dht_selfheal_dir_finish (frame, this, 0);

                 return 0;

         }

@@ -954,7 +960,7 @@ dht_selfheal_dir_xattr_for_nameless_lookup (call_frame_t *frame, loc_t *loc,

                       missing_xattr, loc->path);

         if (missing_xattr == 0) {

-                dht_selfheal_dir_finish (frame, this, 0, 0);

+                dht_selfheal_dir_finish (frame, this, 0);

                 return 0;

         }

@@ -1022,7 +1028,7 @@ dht_selfheal_dir_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

                                                 dht_should_heal_layout);

                 if (ret < 0) {

-                        dht_selfheal_dir_finish (frame, this, -1, 0);

+                        dht_selfheal_dir_finish (frame, this, -1);

                 }

         }

@@ -1053,7 +1059,7 @@ dht_selfheal_dir_setattr (call_frame_t *frame, loc_t *loc, struct iatt *stbuf,

                                                 dht_should_heal_layout);

                 if (ret < 0) {

-                        dht_selfheal_dir_finish (frame, this, -1, 0);

+                        dht_selfheal_dir_finish (frame, this, -1);

                 }

                 return 0;

@@ -1091,7 +1097,7 @@ dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         dht_layout_t  *layout = NULL;

         call_frame_t  *prev = NULL;

         xlator_t      *subvol = NULL;

-        int            i = 0, ret = -1;

+        int            i = 0;

         int            this_call_cnt = 0;

         char           gfid[GF_UUID_BUF_SIZE] = {0};

@@ -1122,13 +1128,11 @@ dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

         dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);

         dht_iatt_merge (this, &local->preparent, preparent, prev->this);

         dht_iatt_merge (this, &local->postparent, postparent, prev->this);

-        ret = 0;

 out:

         this_call_cnt = dht_frame_return (frame);

         if (is_last_call (this_call_cnt)) {

-                dht_selfheal_dir_finish (frame, this, ret, -1);

                 dht_selfheal_dir_setattr (frame, &local->loc, &local->stbuf, 0xffffff, layout);

         }

@@ -1181,33 +1185,33 @@ out:

 }

 int

-dht_selfheal_dir_mkdir_lock_cbk (call_frame_t *frame, void *cookie, xlator_t *this,

-                                 int32_t op_ret, int32_t op_errno, dict_t *xdata)

+dht_selfheal_dir_mkdir (call_frame_t *frame, loc_t *loc,

+                        dht_layout_t *layout, int force)

 {

-        dht_local_t  *local = NULL;

+        int           missing_dirs = 0;

         int           i     = 0;

         int           ret   = -1;

+        dht_local_t  *local = NULL;

+        xlator_t     *this = NULL;

         dict_t       *dict = NULL;

-        dht_layout_t  *layout = NULL;

-        loc_t        *loc   = NULL;

-

-        VALIDATE_OR_GOTO (this->private, err);