3 files changed, 2 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 5c085b611..99305b718 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -44,6 +44,7 @@
 #include "compat.h"
 #include "byte-order.h"
 #include "statedump.h"
+#include "inode.h"
 
 #include "fd.h"
 
@@ -1807,7 +1808,7 @@ afr_set_root_inode_on_first_lookup (afr_local_t *local, xlator_t *this,
         afr_private_t           *priv = NULL;
         GF_ASSERT (inode);
 
-        if (inode->ino != 1)
+        if (!__is_root_gfid (inode->gfid))
                 goto out;
         if (!afr_is_fresh_lookup (&local->loc, this))
                 goto out;
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c
index 2d7f98a2a..ca669b684 100644
--- a/xlators/cluster/afr/src/afr-dir-write.c
+++ b/xlators/cluster/afr/src/afr-dir-write.c
@@ -70,7 +70,6 @@ afr_build_parent_loc (loc_t *parent, loc_t *child)
 
         parent->inode  = inode_ref (child->parent);
         parent->parent = inode_parent (parent->inode, 0, NULL);
-        parent->ino    = parent->inode->ino;
 
         if (!uuid_is_null (child->pargfid))
                 uuid_copy (parent->gfid, child->pargfid);
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index afddf62c2..d0cd2f02d 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -501,8 +501,6 @@ afr_build_root_loc (inode_t *inode, loc_t *loc)
         loc->path = "/";
         loc->name = "";
         loc->inode = inode;
-        loc->ino = 1;
-        loc->inode->ino = 1;
         loc->inode->ia_type = IA_IFDIR;
         memset (loc->inode->gfid, 0, 16);
         loc->inode->gfid[15] = 1;