core: fill 'ia_ino' from 'ia_gfid' in 'storage/posix' to preserve same ino number

take the least significant 64bit from gfid and assign it to 'ia_ino',
hence for a given file (or directory), the 'ia_ino' number is always
same, and we need not worry about the 'itransform' in 'cluster/*'
translators.

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 3042 (inode number should be constant on storage)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3042

6 files changed, 5 insertions, 154 deletions

diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index e921d9c3196..6bdc9d30139 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -132,17 +132,6 @@ dht_lookup_selfheal_cbk (call_frame_t *frame, void *cookie,
         if (ret == 0) {
                 layout = local->selfheal.layout;
                 ret = dht_layout_set (this, local->inode, layout);
-
-                if (local->ia_ino) {
-                        local->stbuf.ia_ino = local->ia_ino;
-                } else {
-                        gf_log (this->name, GF_LOG_DEBUG,
-                                "could not find hashed subvolume for %s",
-                                local->loc.path);
-                }
-
-                if (local->loc.parent)
-                        local->postparent.ia_ino = local->loc.parent->ino;
         }
 
         WIPE (&local->postparent);
@@ -234,12 +223,6 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
                 dht_iatt_merge (this, &local->postparent, postparent,
                                 prev->this);
-
-                if (!local->ia_ino &&
-                    (prev->this == dht_first_up_subvol (this))) {
-                        local->ia_ino = local->stbuf.ia_ino;
-                }
-
         }
 unlock:
         UNLOCK (&frame->lock);
@@ -265,18 +248,6 @@ unlock:
                         }
 
                         dht_layout_set (this, local->inode, layout);
-
-                        if (local->ia_ino) {
-                                local->stbuf.ia_ino = local->ia_ino;
-                        } else {
-                                gf_log (this->name, GF_LOG_DEBUG,
-                                        "could not find hashed subvol for %s",
-                                        local->loc.path);
-                        }
-
-                        if (local->loc.parent)
-                                local->postparent.ia_ino =
-                                        local->loc.parent->ino;
                 }
 
                 DHT_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno,
@@ -389,10 +360,6 @@ dht_revalidate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 prev->this);
 
                 local->op_ret = 0;
-                local->stbuf.ia_ino = local->ia_ino;
-
-                if (local->loc.parent)
-                        local->postparent.ia_ino = local->loc.parent->ino;
 
                 if (!local->xattr) {
                         local->xattr = dict_ref (xattr);
@@ -476,9 +443,6 @@ dht_lookup_linkfile_create_cbk (call_frame_t *frame, void *cookie,
                 local->stbuf.ia_prot.sticky = 1;
         }
 
-        if (local->loc.parent)
-                local->postparent.ia_ino = local->loc.parent->ino;
-
 unwind:
         WIPE (&local->postparent);
 
@@ -545,10 +509,6 @@ dht_lookup_everywhere_done (call_frame_t *frame, xlator_t *this)
                         local->op_errno = EINVAL;
                 }
 
-                if (local->loc.parent)
-                        local->postparent.ia_ino =
-                                local->loc.parent->ino;
-
                 WIPE (&local->postparent);
 
                 DHT_STACK_UNWIND (lookup, frame, local->op_ret,
@@ -800,9 +760,6 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
             && (conf && conf->unhashed_sticky_bit)) {
                 stbuf->ia_prot.sticky = 1;
         }
-        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
-        if (local->loc.parent)
-                postparent->ia_ino = local->loc.parent->ino;
 
         ret = dht_layout_preset (this, prev->this, inode);
         if (ret < 0) {
@@ -958,11 +915,6 @@ dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (!is_linkfile) {
                 /* non-directory and not a linkfile */
 
-                dht_itransform (this, prev->this, stbuf->ia_ino,
-                                &stbuf->ia_ino);
-                if (loc->parent)
-                        postparent->ia_ino = loc->parent->ino;
-
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_INFO,
@@ -1074,8 +1026,6 @@ dht_lookup (call_frame_t *frame, xlator_t *this,
                         goto err;
                 }
 
-                local->ia_ino   = loc->inode->ino;
-
                 if (layout->gen && (layout->gen < conf->gen)) {
                         gf_log (this->name, GF_LOG_TRACE,
                                 "incomplete layout failure for path=%s",
@@ -1185,11 +1135,6 @@ dht_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->prebuf, prebuf, prev->this);
                 dht_iatt_merge (this, &local->stbuf, postbuf, prev->this);
 
-                if (local->inode) {
-                        local->stbuf.ia_ino = local->inode->ino;
-                        local->prebuf.ia_ino = local->inode->ino;
-                }
-
                 local->op_ret = 0;
         }
 unlock:
@@ -1233,8 +1178,6 @@ dht_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
                 dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
 
-                if (local->inode)
-                        local->stbuf.ia_ino = local->inode->ino;
                 local->op_ret = 0;
         }
 unlock:
@@ -1463,8 +1406,6 @@ dht_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         goto unlock;
                 }
 
-                preparent->ia_ino = local->loc.parent->ino;
-                postparent->ia_ino = local->loc.parent->ino;
                 local->op_ret = 0;
 
                 local->postparent = *postparent;
@@ -1563,11 +1504,6 @@ dht_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
 unlock:
         UNLOCK (&frame->lock);
 
-        if (local && (op_ret == 0)) {
-                prebuf->ia_ino = local->ia_ino;
-                postbuf->ia_ino = local->ia_ino;
-        }
-
         this_call_cnt = dht_frame_return (frame);
         if (is_last_call (this_call_cnt))
                 DHT_STACK_UNWIND (fsync, frame, local->op_ret, local->op_errno,
@@ -1669,9 +1605,7 @@ dht_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret == -1)
                 goto err;
 
-        if (local) {
-                sbuf->ia_ino = local->ia_ino;
-        } else {
+        if (!local) {
                 op_ret = -1;
                 op_errno = EINVAL;
         }
@@ -1711,8 +1645,6 @@ dht_readlink (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
-        local->ia_ino = loc->inode->ino;
-
         STACK_WIND (frame, dht_readlink_cbk,
                     subvol, subvol->fops->readlink,
                     loc, size);
@@ -2411,8 +2343,6 @@ dht_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 goto out;
         }
 
-        if (op_ret != -1)
-                stbuf->ia_ino = local->ia_ino;
 out:
         DHT_STACK_UNWIND (readv, frame, op_ret, op_errno, vector, count, stbuf,
                           iobref);
@@ -2447,7 +2377,6 @@ dht_readv (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
-        local->ia_ino = fd->inode->ino;
         STACK_WIND (frame, dht_readv_cbk,
                     subvol, subvol->fops->readv,
                     fd, size, off);
@@ -2480,9 +2409,6 @@ dht_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 goto out;
         }
 
-        prebuf->ia_ino = local->ia_ino;
-        postbuf->ia_ino = local->ia_ino;
-
 out:
         DHT_STACK_UNWIND (writev, frame, op_ret, op_errno, prebuf, postbuf);
 
@@ -2518,8 +2444,6 @@ dht_writev (call_frame_t *frame, xlator_t *this,
                 goto err;
         }
 
-        local->ia_ino = fd->inode->ino;
-
         STACK_WIND (frame, dht_writev_cbk,
                     subvol, subvol->fops->writev,
                     fd, vector, count, off, iobref);
@@ -2606,8 +2530,6 @@ dht_fsync (call_frame_t *frame, xlator_t *this,
         }
         local->call_cnt = 1;
 
-        local->ia_ino = fd->inode->ino;
-
         STACK_WIND (frame, dht_fsync_cbk,
                     subvol, subvol->fops->fsync,
                     fd, datasync);
@@ -2905,14 +2827,12 @@ dht_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
                                 layout->search_unhashed++;
                         }
                 }
-                entry->d_stat = orig_entry->d_stat;
 
-                dht_itransform (this, prev->this, orig_entry->d_ino,
-                                &entry->d_ino);
                 dht_itransform (this, prev->this, orig_entry->d_off,
                                 &entry->d_off);
 
-                entry->d_stat.ia_ino = entry->d_ino;
+                entry->d_stat = orig_entry->d_stat;
+                entry->d_ino  = orig_entry->d_ino;
                 entry->d_type = orig_entry->d_type;
                 entry->d_len  = orig_entry->d_len;
 
@@ -3006,11 +2926,10 @@ dht_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                 goto unwind;
                         }
 
-                        dht_itransform (this, prev->this, orig_entry->d_ino,
-                                        &entry->d_ino);
                         dht_itransform (this, prev->this, orig_entry->d_off,
                                         &entry->d_off);
 
+                        entry->d_ino  = orig_entry->d_ino;
                         entry->d_type = orig_entry->d_type;
                         entry->d_len  = orig_entry->d_len;
 
@@ -3240,11 +3159,7 @@ dht_newfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         prev = cookie;
 
-        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
         if (local->loc.parent) {
-                preparent->ia_ino = local->loc.parent->ino;
-                postparent->ia_ino = local->loc.parent->ino;
-
                 WIPE (preparent);
                 WIPE (postparent);
         }
@@ -3537,11 +3452,6 @@ dht_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 goto out;
         }
 
-        stbuf->ia_ino = local->loc.inode->ino;
-
-        preparent->ia_ino = local->loc2.parent->ino;
-        postparent->ia_ino = local->loc2.parent->ino;
-
         WIPE (preparent);
         WIPE (postparent);
 
@@ -3679,11 +3589,7 @@ dht_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         prev = cookie;
 
-        dht_itransform (this, prev->this, stbuf->ia_ino, &stbuf->ia_ino);
         if (local->loc.parent) {
-                preparent->ia_ino = local->loc.parent->ino;
-                postparent->ia_ino = local->loc.parent->ino;
-
                 WIPE (preparent);
                 WIPE (postparent);
         }
@@ -3843,11 +3749,7 @@ dht_mkdir_selfheal_cbk (call_frame_t *frame, void *cookie,
 
         if (op_ret == 0) {
                 dht_layout_set (this, local->inode, layout);
-                local->stbuf.ia_ino = local->ia_ino;
                 if (local->loc.parent) {
-                        local->preparent.ia_ino = local->loc.parent->ino;
-                        local->postparent.ia_ino = local->loc.parent->ino;
-
                         WIPE (&local->preparent);
                         WIPE (&local->postparent);
                 }
@@ -3898,11 +3800,6 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->preparent, preparent, prev->this);
                 dht_iatt_merge (this, &local->postparent, postparent,
                                 prev->this);
-
-                if (prev->this == dht_first_up_subvol (this)) {
-                        local->ia_ino = local->stbuf.ia_ino;
-                }
-
         }
 unlock:
         UNLOCK (&frame->lock);
@@ -3958,8 +3855,6 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie,
         dht_iatt_merge (this, &local->preparent, preparent, prev->this);
         dht_iatt_merge (this, &local->postparent, postparent, prev->this);
 
-        local->ia_ino = local->stbuf.ia_ino;
-
         local->call_cnt = conf->subvolume_cnt - 1;
 
         if (local->call_cnt == 0) {
@@ -4063,11 +3958,6 @@ dht_rmdir_selfheal_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         local = frame->local;
 
-        if (local->loc.parent) {
-                local->preparent.ia_ino = local->loc.parent->ino;
-                local->postparent.ia_ino = local->loc.parent->ino;
-        }
-
         DHT_STACK_UNWIND (rmdir, frame, local->op_ret, local->op_errno,
                           &local->preparent, &local->postparent);
 
@@ -4125,11 +4015,6 @@ unlock:
                                               &local->loc, local->layout);
                 } else {
                         if (local->loc.parent) {
-                                local->preparent.ia_ino =
-                                        local->loc.parent->ino;
-                                local->postparent.ia_ino =
-                                        local->loc.parent->ino;
-
                                 WIPE (&local->preparent);
                                 WIPE (&local->postparent);
                         }
@@ -4821,11 +4706,6 @@ dht_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 dht_iatt_merge (this, &local->prebuf, statpre, prev->this);
                 dht_iatt_merge (this, &local->stbuf, statpost, prev->this);
 
-                if (local->inode) {
-                        local->prebuf.ia_ino = local->inode->ino;
-                        local->stbuf.ia_ino = local->inode->ino;
-                }
-
                 local->op_ret = 0;
         }
 unlock:
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index 42c6d025fc5..bb7ae047610 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -445,8 +445,7 @@ dht_iatt_merge (xlator_t *this, struct iatt *to,
 
         uuid_copy (to->ia_gfid, from->ia_gfid);
 
-        dht_itransform (this, subvol, from->ia_ino, &to->ia_ino);
-
+        to->ia_ino      = from->ia_ino;
         to->ia_prot     = from->ia_prot;
         to->ia_type     = from->ia_type;
         to->ia_nlink    = from->ia_nlink;
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index cef4a7b6fbc..2db707cb57b 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -75,14 +75,6 @@ dht_rename_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 unwind:
         this_call_cnt = dht_frame_return (frame);
         if (is_last_call (this_call_cnt)) {
-                local->stbuf.ia_ino = local->loc.inode->ino;
-
-                local->preoldparent.ia_ino = local->loc.parent->ino;
-                local->postoldparent.ia_ino = local->loc.parent->ino;
-
-                local->preparent.ia_ino = local->loc2.parent->ino;
-                local->postparent.ia_ino = local->loc2.parent->ino;
-
                 WIPE (&local->preoldparent);
                 WIPE (&local->postoldparent);
                 WIPE (&local->preparent);
@@ -399,14 +391,6 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         dht_iatt_merge (this, &local->preparent, prenewparent, prev->this);
         dht_iatt_merge (this, &local->postparent, postnewparent, prev->this);
 
-        local->stbuf.ia_ino = local->loc.inode->ino;
-
-        local->preoldparent.ia_ino = local->loc.parent->ino;
-        local->postoldparent.ia_ino = local->loc.parent->ino;
-
-        local->preparent.ia_ino = local->loc2.parent->ino;
-        local->postparent.ia_ino = local->loc2.parent->ino;
-
         /* NOTE: rename_subvol is the same subvolume from which dht_rename_cbk
          *       is called. since rename has already happened on rename_subvol,
          *       unlink should not be sent for oldpath (either linkfile or cached-file)
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index ddd043dc8a4..e05894a5c2d 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -289,9 +289,6 @@ dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         }
 
         dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
-        if (prev->this == local->hashed_subvol)
-                local->ia_ino = local->stbuf.ia_ino;
-
         dht_iatt_merge (this, &local->preparent, preparent, prev->this);
         dht_iatt_merge (this, &local->postparent, postparent, prev->this);
 
diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c
index f83edd26abf..45fea55ae3b 100644
--- a/xlators/cluster/dht/src/nufa.c
+++ b/xlators/cluster/dht/src/nufa.c
@@ -67,10 +67,6 @@ nufa_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         if (!is_dir && !is_linkfile) {
                 /* non-directory and not a linkfile */
-
-                dht_itransform (this, prev->this, stbuf->ia_ino,
-                                &stbuf->ia_ino);
-
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -220,7 +216,6 @@ nufa_lookup (call_frame_t *frame, xlator_t *this,
                 }
 
                 local->inode    = inode_ref (loc->inode);
-                local->ia_ino   = loc->inode->ino;
 
                 local->call_cnt = layout->cnt;
                 call_cnt = local->call_cnt;
diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c
index 06d93cba150..e4bed0dd96e 100644
--- a/xlators/cluster/dht/src/switch.c
+++ b/xlators/cluster/dht/src/switch.c
@@ -142,9 +142,6 @@ switch_local_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (!is_dir && !is_linkfile) {
                 /* non-directory and not a linkfile */
 
-                dht_itransform (this, prev->this, stbuf->ia_ino,
-                                &stbuf->ia_ino);
-
                 ret = dht_layout_preset (this, prev->this, inode);
                 if (ret < 0) {
                         gf_log (this->name, GF_LOG_DEBUG,
@@ -296,7 +293,6 @@ switch_lookup (call_frame_t *frame, xlator_t *this,
                 }
 
                 local->inode    = inode_ref (loc->inode);
-                local->ia_ino   = loc->inode->ino;
 
                 local->call_cnt = layout->cnt;
                 call_cnt = local->call_cnt;